ARM: multi_v7_defconfig: fix support for APQ8084

[linux-2.6-block.git] / arch / arm / mach-ixp4xx / common-pci.c

diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c
index 200970d56f6d8c7c0b9a166584ee38eddad4fe31..4977296f0c7804272a5854ba5223b786761b7716 100644 (file)
--- a/arch/arm/mach-ixp4xx/common-pci.c
+++ b/arch/arm/mach-ixp4xx/common-pci.c
@@ -315,33 +315,6 @@ static int abort_handler(unsigned long addr, unsigned int fsr, struct pt_regs *r
        return 0;
 }
 
-
-static int ixp4xx_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)
-{
-       return (dma_addr + size) >= SZ_64M;
-}
-
-/*
- * Setup DMA mask to 64MB on PCI devices. Ignore all other devices.
- */
-static int ixp4xx_pci_platform_notify(struct device *dev)
-{
-       if (dev_is_pci(dev)) {
-               *dev->dma_mask =  SZ_64M - 1;
-               dev->coherent_dma_mask = SZ_64M - 1;
-               dmabounce_register_dev(dev, 2048, 4096, ixp4xx_needs_bounce);
-       }
-       return 0;
-}
-
-static int ixp4xx_pci_platform_notify_remove(struct device *dev)
-{
-       if (dev_is_pci(dev))
-               dmabounce_unregister_dev(dev);
-
-       return 0;
-}
-
 void __init ixp4xx_pci_preinit(void)
 {
        unsigned long cpuid = read_cpuid_id();
@@ -475,20 +448,8 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)
        pci_add_resource_offset(&sys->resources, &res[0], sys->io_offset);
        pci_add_resource_offset(&sys->resources, &res[1], sys->mem_offset);
 
-       platform_notify = ixp4xx_pci_platform_notify;
-       platform_notify_remove = ixp4xx_pci_platform_notify_remove;
-
        return 1;
 }
 
-int dma_set_coherent_mask(struct device *dev, u64 mask)
-{
-       if (mask >= SZ_64M - 1)
-               return 0;
-
-       return -EIO;
-}
-
 EXPORT_SYMBOL(ixp4xx_pci_read);
 EXPORT_SYMBOL(ixp4xx_pci_write);
-EXPORT_SYMBOL(dma_set_coherent_mask);