diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-13 11:01:27 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-13 11:01:27 -0700 |
| commit | 1d72e71d4542d2eff16c74242f7e5dfca38fb49a (patch) | |
| tree | dfdf37c552b98b9b82e1037be5037748dad3841c /arch/arm/common/it8152.c | |
| parent | 6c52f51ccbb371d9161a1081560df7d31df4c495 (diff) | |
| parent | 09296c0bbbc107586a43e9ca7c7214153bbbefa6 (diff) | |
Merge branch 'pci/yijing-dev_is_pci' into next
* pci/yijing-dev_is_pci:
alpha/PCI: Use dev_is_pci() to identify PCI devices
arm/PCI: Use dev_is_pci() to identify PCI devices
arm/PCI: Use dev_is_pci() to identify PCI devices
parisc/PCI: Use dev_is_pci() to identify PCI devices
sparc/PCI: Use dev_is_pci() to identify PCI devices
ia64/PCI: Use dev_is_pci() to identify PCI devices
x86/PCI: Use dev_is_pci() to identify PCI devices
PCI: Use dev_is_pci() to identify PCI devices
Diffstat (limited to 'arch/arm/common/it8152.c')
| -rw-r--r-- | arch/arm/common/it8152.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c index 001f4913799..5114b68e99d 100644 --- a/arch/arm/common/it8152.c +++ b/arch/arm/common/it8152.c @@ -257,7 +257,7 @@ static int it8152_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t s */ static int it8152_pci_platform_notify(struct device *dev) { - if (dev->bus == &pci_bus_type) { + if (dev_is_pci(dev)) { if (dev->dma_mask) *dev->dma_mask = (SZ_64M - 1) | PHYS_OFFSET; dev->coherent_dma_mask = (SZ_64M - 1) | PHYS_OFFSET; @@ -268,7 +268,7 @@ static int it8152_pci_platform_notify(struct device *dev) static int it8152_pci_platform_notify_remove(struct device *dev) { - if (dev->bus == &pci_bus_type) + if (dev_is_pci(dev)) dmabounce_unregister_dev(dev); return 0; |