Use dev_is_pci() instead of checking bus type directly.
Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
---
v1->v2: Keep #ifdef CONFIG_PCI code to avoid build error, found by
kbuild test.
---
arch/sparc/include/asm/dma-mapping.h | 7 +++----
arch/sparc/kernel/iommu.c | 2 +-
arch/sparc/kernel/ioport.c | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h
index 05fe53f..ab529f1 100644
--- a/arch/sparc/include/asm/dma-mapping.h
+++ b/arch/sparc/include/asm/dma-mapping.h
@@ -4,6 +4,7 @@
#include <linux/scatterlist.h>
#include <linux/mm.h>
#include <linux/dma-debug.h>
+#include <linux/pci.h>
#define DMA_ERROR_CODE (~(dma_addr_t)0x0)
@@ -16,14 +17,12 @@ extern struct dma_map_ops *dma_ops;
extern struct dma_map_ops *leon_dma_ops;
extern struct dma_map_ops pci32_dma_ops;
-extern struct bus_type pci_bus_type;
-
static inline struct dma_map_ops *get_dma_ops(struct device *dev)
{
#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
if (sparc_cpu_model == sparc_leon)
return leon_dma_ops;
- else if (dev->bus == &pci_bus_type)
+ else if (dev_is_pci(dev))
return &pci32_dma_ops;
#endif
return dma_ops;
@@ -66,7 +65,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
static inline int dma_set_mask(struct device *dev, u64 mask)
{
#ifdef CONFIG_PCI
- if (dev->bus == &pci_bus_type) {
+ if (dev_is_pci(dev)) {
if (!dev->dma_mask || !dma_supported(dev, mask))
return -EINVAL;
*dev->dma_mask = mask;
diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
index 070ed14..76663b0 100644
--- a/arch/sparc/kernel/iommu.c
+++ b/arch/sparc/kernel/iommu.c
@@ -854,7 +854,7 @@ int dma_supported(struct device *dev, u64 device_mask)
return 1;
#ifdef CONFIG_PCI
- if (dev->bus == &pci_bus_type)
+ if (dev_is_pci(dev))
return pci64_dma_supported(to_pci_dev(dev), device_mask);
#endif
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 2096468..5b8aab9 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -667,7 +667,7 @@ EXPORT_SYMBOL(dma_ops);
int dma_supported(struct device *dev, u64 mask)
{
#ifdef CONFIG_PCI
- if (dev->bus == &pci_bus_type)
+ if (dev_is_pci(dev))
return 1;
#endif
return 0;
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
