Merge tag 'pci-v3.14-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[~andy/linux] / arch / ia64 / sn / pci / pci_dma.c

diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c
index 3290d6e00c3164674e2d2d018c9b992dbc5fc152..d0853e8e8623e46a4a5e7ad87072e7ca354af0a0 100644 (file)
--- a/arch/ia64/sn/pci/pci_dma.c
+++ b/arch/ia64/sn/pci/pci_dma.c
@@ -34,7 +34,7 @@
  */
 static int sn_dma_supported(struct device *dev, u64 mask)
 {
-       BUG_ON(dev->bus != &pci_bus_type);
+       BUG_ON(!dev_is_pci(dev));
 
        if (mask < 0x7fffffff)
                return 0;
@@ -50,7 +50,7 @@ static int sn_dma_supported(struct device *dev, u64 mask)
  */
 int sn_dma_set_mask(struct device *dev, u64 dma_mask)
 {
-       BUG_ON(dev->bus != &pci_bus_type);
+       BUG_ON(!dev_is_pci(dev));
 
        if (!sn_dma_supported(dev, dma_mask))
                return 0;
@@ -85,7 +85,7 @@ static void *sn_dma_alloc_coherent(struct device *dev, size_t size,
        struct pci_dev *pdev = to_pci_dev(dev);
        struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
 
-       BUG_ON(dev->bus != &pci_bus_type);
+       BUG_ON(!dev_is_pci(dev));
 
        /*
         * Allocate the memory.
@@ -143,7 +143,7 @@ static void sn_dma_free_coherent(struct device *dev, size_t size, void *cpu_addr
        struct pci_dev *pdev = to_pci_dev(dev);
        struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
 
-       BUG_ON(dev->bus != &pci_bus_type);
+       BUG_ON(!dev_is_pci(dev));
 
        provider->dma_unmap(pdev, dma_handle, 0);
        free_pages((unsigned long)cpu_addr, get_order(size));
@@ -187,7 +187,7 @@ static dma_addr_t sn_dma_map_page(struct device *dev, struct page *page,
 
        dmabarr = dma_get_attr(DMA_ATTR_WRITE_BARRIER, attrs);
 
-       BUG_ON(dev->bus != &pci_bus_type);
+       BUG_ON(!dev_is_pci(dev));
 
        phys_addr = __pa(cpu_addr);
        if (dmabarr)
@@ -223,7 +223,7 @@ static void sn_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
        struct pci_dev *pdev = to_pci_dev(dev);
        struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
 
-       BUG_ON(dev->bus != &pci_bus_type);
+       BUG_ON(!dev_is_pci(dev));
 
        provider->dma_unmap(pdev, dma_addr, dir);
 }
@@ -247,7 +247,7 @@ static void sn_dma_unmap_sg(struct device *dev, struct scatterlist *sgl,
        struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
        struct scatterlist *sg;
 
-       BUG_ON(dev->bus != &pci_bus_type);
+       BUG_ON(!dev_is_pci(dev));
 
        for_each_sg(sgl, sg, nhwentries, i) {
                provider->dma_unmap(pdev, sg->dma_address, dir);
@@ -284,7 +284,7 @@ static int sn_dma_map_sg(struct device *dev, struct scatterlist *sgl,
 
        dmabarr = dma_get_attr(DMA_ATTR_WRITE_BARRIER, attrs);
 
-       BUG_ON(dev->bus != &pci_bus_type);
+       BUG_ON(!dev_is_pci(dev));
 
        /*
         * Setup a DMA address for each entry in the scatterlist.
@@ -323,26 +323,26 @@ static int sn_dma_map_sg(struct device *dev, struct scatterlist *sgl,
 static void sn_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
                                       size_t size, enum dma_data_direction dir)
 {
-       BUG_ON(dev->bus != &pci_bus_type);
+       BUG_ON(!dev_is_pci(dev));
 }
 
 static void sn_dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
                                          size_t size,
                                          enum dma_data_direction dir)
 {
-       BUG_ON(dev->bus != &pci_bus_type);
+       BUG_ON(!dev_is_pci(dev));
 }
 
 static void sn_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
                                   int nelems, enum dma_data_direction dir)
 {
-       BUG_ON(dev->bus != &pci_bus_type);
+       BUG_ON(!dev_is_pci(dev));
 }
 
 static void sn_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
                                      int nelems, enum dma_data_direction dir)
 {
-       BUG_ON(dev->bus != &pci_bus_type);
+       BUG_ON(!dev_is_pci(dev));
 }
 
 static int sn_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)