| 1 | From 36cad96a50eb877d0c5cb3d8d93c1807ad9c774c Mon Sep 17 00:00:00 2001 |
| 2 | From: Daniel Hellstrom <daniel@gaisler.com> |
| 3 | Date: Wed, 1 Dec 2010 09:37:23 +0100 |
| 4 | Subject: [PATCH] Fix kristoffers ioport.c patch for more recent kernel. |
| 5 | |
| 6 | Signed-off-by: Daniel Hellstrom <daniel@gaisler.com> |
| 7 | --- |
| 8 | arch/sparc/include/asm/dma-mapping.h | 13 +------------ |
| 9 | arch/sparc/kernel/ioport.c | 3 ++- |
| 10 | 2 files changed, 3 insertions(+), 13 deletions(-) |
| 11 | |
| 12 | --- a/arch/sparc/include/asm/dma-mapping.h |
| 13 | +++ b/arch/sparc/include/asm/dma-mapping.h |
| 14 | @@ -51,17 +51,6 @@ static inline int dma_mapping_error(stru |
| 15 | return (dma_addr == DMA_ERROR_CODE); |
| 16 | } |
| 17 | |
| 18 | -static inline int dma_set_mask(struct device *dev, u64 mask) |
| 19 | -{ |
| 20 | -#ifdef CONFIG_PCI |
| 21 | - if (dev->bus == &pci_bus_type) { |
| 22 | - if (!dev->dma_mask || !dma_supported(dev, mask)) |
| 23 | - return -EINVAL; |
| 24 | - *dev->dma_mask = mask; |
| 25 | - return 0; |
| 26 | - } |
| 27 | -#endif |
| 28 | - return -EINVAL; |
| 29 | -} |
| 30 | +extern int dma_set_mask(struct device *dev, u64 dma_mask); |
| 31 | |
| 32 | #endif |
| 33 | --- a/arch/sparc/kernel/ioport.c |
| 34 | +++ b/arch/sparc/kernel/ioport.c |
| 35 | @@ -301,7 +301,7 @@ static void *sbus_alloc_coherent(struct |
| 36 | goto err_nova; |
| 37 | } |
| 38 | #endif |
| 39 | - res->name = op->node->name; |
| 40 | + res->name = op->dev.of_node->name; |
| 41 | |
| 42 | return (void *)(unsigned long)res->start; |
| 43 | |
| 44 | @@ -737,6 +737,7 @@ int dma_set_mask(struct device *dev, u64 |
| 45 | } |
| 46 | EXPORT_SYMBOL(dma_set_mask); |
| 47 | |
| 48 | + |
| 49 | #ifdef CONFIG_PROC_FS |
| 50 | |
| 51 | static int sparc_io_proc_show(struct seq_file *m, void *v) |
| 52 | |
