diff options
Diffstat (limited to 'kernel/arch/frv/mb93090-mb00')
| -rw-r--r-- | kernel/arch/frv/mb93090-mb00/flash.c | 2 | ||||
| -rw-r--r-- | kernel/arch/frv/mb93090-mb00/pci-dma-nommu.c | 10 | ||||
| -rw-r--r-- | kernel/arch/frv/mb93090-mb00/pci-dma.c | 7 | ||||
| -rw-r--r-- | kernel/arch/frv/mb93090-mb00/pci-frv.c | 8 | ||||
| -rw-r--r-- | kernel/arch/frv/mb93090-mb00/pci-frv.h | 8 |
5 files changed, 11 insertions, 24 deletions
diff --git a/kernel/arch/frv/mb93090-mb00/flash.c b/kernel/arch/frv/mb93090-mb00/flash.c index c0e3707c2..e1cf802d1 100644 --- a/kernel/arch/frv/mb93090-mb00/flash.c +++ b/kernel/arch/frv/mb93090-mb00/flash.c @@ -9,7 +9,7 @@ * 2 of the Licence, or (at your option) any later version. */ -#include <linux/init.h> +#include <linux/module.h> #include <linux/platform_device.h> #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h> diff --git a/kernel/arch/frv/mb93090-mb00/pci-dma-nommu.c b/kernel/arch/frv/mb93090-mb00/pci-dma-nommu.c index b99c2a7cc..8eeea0d77 100644 --- a/kernel/arch/frv/mb93090-mb00/pci-dma-nommu.c +++ b/kernel/arch/frv/mb93090-mb00/pci-dma-nommu.c @@ -119,14 +119,16 @@ dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, EXPORT_SYMBOL(dma_map_single); -int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, +int dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction) { int i; + struct scatterlist *sg; - for (i=0; i<nents; i++) - frv_cache_wback_inv(sg_dma_address(&sg[i]), - sg_dma_address(&sg[i]) + sg_dma_len(&sg[i])); + for_each_sg(sglist, sg, nents, i) { + frv_cache_wback_inv(sg_dma_address(sg), + sg_dma_address(sg) + sg_dma_len(sg)); + } BUG_ON(direction == DMA_NONE); diff --git a/kernel/arch/frv/mb93090-mb00/pci-dma.c b/kernel/arch/frv/mb93090-mb00/pci-dma.c index 82478979a..4d1f01dc4 100644 --- a/kernel/arch/frv/mb93090-mb00/pci-dma.c +++ b/kernel/arch/frv/mb93090-mb00/pci-dma.c @@ -50,19 +50,20 @@ dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, EXPORT_SYMBOL(dma_map_single); -int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, +int dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction) { unsigned long dampr2; void *vaddr; int i; + struct scatterlist *sg; BUG_ON(direction == DMA_NONE); dampr2 = __get_DAMPR(2); - for (i = 0; i < nents; i++) { - vaddr = kmap_atomic_primary(sg_page(&sg[i])); + for_each_sg(sglist, sg, nents, i) { + vaddr = kmap_atomic_primary(sg_page(sg)); frv_dcache_writeback((unsigned long) vaddr, (unsigned long) vaddr + PAGE_SIZE); diff --git a/kernel/arch/frv/mb93090-mb00/pci-frv.c b/kernel/arch/frv/mb93090-mb00/pci-frv.c index 0635bd6c2..34bb4b13e 100644 --- a/kernel/arch/frv/mb93090-mb00/pci-frv.c +++ b/kernel/arch/frv/mb93090-mb00/pci-frv.c @@ -175,14 +175,6 @@ static void __init pcibios_assign_resources(void) if (!r->start && r->end) pci_assign_resource(dev, idx); } - - if (pci_probe & PCI_ASSIGN_ROMS) { - r = &dev->resource[PCI_ROM_RESOURCE]; - r->end -= r->start; - r->start = 0; - if (r->end) - pci_assign_resource(dev, PCI_ROM_RESOURCE); - } } } diff --git a/kernel/arch/frv/mb93090-mb00/pci-frv.h b/kernel/arch/frv/mb93090-mb00/pci-frv.h index a7e487fe7..d51992ff5 100644 --- a/kernel/arch/frv/mb93090-mb00/pci-frv.h +++ b/kernel/arch/frv/mb93090-mb00/pci-frv.h @@ -14,14 +14,6 @@ #define DBG(x...) #endif -#define PCI_PROBE_BIOS 0x0001 -#define PCI_PROBE_CONF1 0x0002 -#define PCI_PROBE_CONF2 0x0004 -#define PCI_NO_CHECKS 0x0400 -#define PCI_ASSIGN_ROMS 0x1000 -#define PCI_BIOS_IRQ_SCAN 0x2000 -#define PCI_ASSIGN_ALL_BUSSES 0x4000 - extern unsigned int __nongpreldata pci_probe; /* pci-frv.c */ |