Message ID | 1386741626-35744-1-git-send-email-wangyijing@huawei.com |
---|---|
State | Accepted |
Headers | show |
From: Yijing Wang <wangyijing@huawei.com> Date: Wed, 11 Dec 2013 14:00:26 +0800 > Use dev_is_pci() instead of checking bus type directly. > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2014/1/5 10:05, David Miller wrote: > From: Yijing Wang <wangyijing@huawei.com> > Date: Wed, 11 Dec 2013 14:00:26 +0800 > >> Use dev_is_pci() instead of checking bus type directly. >> >> Signed-off-by: Yijing Wang <wangyijing@huawei.com> >> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > > Applied. > > Hi David, This patch has been merged in Bjorn's pci tree, so will have some conflict between yours and Bjorn's tree?
From: Yijing Wang <wangyijing@huawei.com> Date: Mon, 6 Jan 2014 09:08:28 +0800 > This patch has been merged in Bjorn's pci tree, so will have some conflict between yours and Bjorn's tree? GIT will figure it out just fine. -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2014/1/6 9:35, David Miller wrote: > From: Yijing Wang <wangyijing@huawei.com> > Date: Mon, 6 Jan 2014 09:08:28 +0800 > >> This patch has been merged in Bjorn's pci tree, so will have some conflict between yours and Bjorn's tree? > > GIT will figure it out just fine. OK, thanks very much! > >
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..e7e215d 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c @@ -666,10 +666,9 @@ 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; } EXPORT_SYMBOL(dma_supported);