This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc64 / kernel / dma.c

diff --git a/arch/ppc64/kernel/dma.c b/arch/ppc64/kernel/dma.c
index c087251..68d517f 100644 (file)
--- a/arch/ppc64/kernel/dma.c
+++ b/arch/ppc64/kernel/dma.c
@@ -17,10 +17,8 @@ int dma_supported(struct device *dev, u64 mask)
 {
        if (dev->bus == &pci_bus_type)
                return pci_dma_supported(to_pci_dev(dev), mask);
-#ifdef CONFIG_IBMVIO
        if (dev->bus == &vio_bus_type)
                return vio_dma_supported(to_vio_dev(dev), mask);
-#endif /* CONFIG_IBMVIO */
        BUG();
        return 0;
 }
@@ -30,10 +28,8 @@ int dma_set_mask(struct device *dev, u64 dma_mask)
 {
        if (dev->bus == &pci_bus_type)
                return pci_set_dma_mask(to_pci_dev(dev), dma_mask);
-#ifdef CONFIG_IBMVIO
        if (dev->bus == &vio_bus_type)
                return vio_set_dma_mask(to_vio_dev(dev), dma_mask);
-#endif /* CONFIG_IBMVIO */
        BUG();
        return 0;
 }
@@ -44,10 +40,8 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
 {
        if (dev->bus == &pci_bus_type)
                return pci_alloc_consistent(to_pci_dev(dev), size, dma_handle);
-#ifdef CONFIG_IBMVIO
        if (dev->bus == &vio_bus_type)
                return vio_alloc_consistent(to_vio_dev(dev), size, dma_handle);
-#endif /* CONFIG_IBMVIO */
        BUG();
        return NULL;
 }
@@ -58,10 +52,8 @@ void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
 {
        if (dev->bus == &pci_bus_type)
                pci_free_consistent(to_pci_dev(dev), size, cpu_addr, dma_handle);
-#ifdef CONFIG_IBMVIO
        else if (dev->bus == &vio_bus_type)
                vio_free_consistent(to_vio_dev(dev), size, cpu_addr, dma_handle);
-#endif /* CONFIG_IBMVIO */
        else
                BUG();
 }
@@ -72,10 +64,8 @@ dma_addr_t dma_map_single(struct device *dev, void *cpu_addr, size_t size,
 {
        if (dev->bus == &pci_bus_type)
                return pci_map_single(to_pci_dev(dev), cpu_addr, size, (int)direction);
-#ifdef CONFIG_IBMVIO
        if (dev->bus == &vio_bus_type)
                return vio_map_single(to_vio_dev(dev), cpu_addr, size, direction);
-#endif /* CONFIG_IBMVIO */
        BUG();
        return (dma_addr_t)0;
 }
@@ -86,10 +76,8 @@ void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
 {
        if (dev->bus == &pci_bus_type)
                pci_unmap_single(to_pci_dev(dev), dma_addr, size, (int)direction);
-#ifdef CONFIG_IBMVIO
        else if (dev->bus == &vio_bus_type)
                vio_unmap_single(to_vio_dev(dev), dma_addr, size, direction);
-#endif /* CONFIG_IBMVIO */
        else
                BUG();
 }
@@ -101,10 +89,8 @@ dma_addr_t dma_map_page(struct device *dev, struct page *page,
 {
        if (dev->bus == &pci_bus_type)
                return pci_map_page(to_pci_dev(dev), page, offset, size, (int)direction);
-#ifdef CONFIG_IBMVIO
        if (dev->bus == &vio_bus_type)
                return vio_map_page(to_vio_dev(dev), page, offset, size, direction);
-#endif /* CONFIG_IBMVIO */
        BUG();
        return (dma_addr_t)0;
 }
@@ -115,10 +101,8 @@ void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
 {
        if (dev->bus == &pci_bus_type)
                pci_unmap_page(to_pci_dev(dev), dma_address, size, (int)direction);
-#ifdef CONFIG_IBMVIO
        else if (dev->bus == &vio_bus_type)
                vio_unmap_page(to_vio_dev(dev), dma_address, size, direction);
-#endif /* CONFIG_IBMVIO */
        else
                BUG();
 }
@@ -129,10 +113,8 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
 {
        if (dev->bus == &pci_bus_type)
                return pci_map_sg(to_pci_dev(dev), sg, nents, (int)direction);
-#ifdef CONFIG_IBMVIO
        if (dev->bus == &vio_bus_type)
                return vio_map_sg(to_vio_dev(dev), sg, nents, direction);
-#endif /* CONFIG_IBMVIO */
        BUG();
        return 0;
 }
@@ -143,10 +125,8 @@ void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
 {
        if (dev->bus == &pci_bus_type)
                pci_unmap_sg(to_pci_dev(dev), sg, nhwentries, (int)direction);
-#ifdef CONFIG_IBMVIO
        else if (dev->bus == &vio_bus_type)
                vio_unmap_sg(to_vio_dev(dev), sg, nhwentries, direction);
-#endif /* CONFIG_IBMVIO */
        else
                BUG();
 }