Message ID | 1386244373-35796-1-git-send-email-wangyijing@huawei.com (mailing list archive) |
---|---|
State | New, archived |
Delegated to: | Bjorn Helgaas |
Headers | show |
[+cc arch lists] On Thu, Dec 05, 2013 at 07:52:53PM +0800, Yijing Wang wrote: > Use dev_is_pci() instead of directly compare > pci_bus_type to check whether it is pci device. > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> I applied all these to my pci/yijing-dev_is_pci branch for v3.14, thanks! Browse them here: http://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=pci/yijing-dev_is_pci This should be no functional change. arch/alpha/kernel/pci_iommu.c | 2 +- arch/arm/common/it8152.c | 4 ++-- arch/arm/mach-ixp4xx/common-pci.c | 6 +++--- arch/ia64/hp/common/sba_iommu.c | 2 +- arch/ia64/sn/pci/pci_dma.c | 24 ++++++++++++------------ arch/parisc/kernel/drivers.c | 22 +++++----------------- arch/powerpc/sysdev/fsl_pci.c | 2 +- arch/sparc/include/asm/dma-mapping.h | 10 ++++------ arch/sparc/kernel/iommu.c | 2 +- arch/sparc/kernel/ioport.c | 4 +--- arch/x86/kernel/acpi/boot.c | 4 +--- drivers/pci/pci-acpi.c | 2 +- 12 files changed, 33 insertions(+), 51 deletions(-) Bjorn > --- > drivers/pci/pci-acpi.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c > index 577074e..e0431f1 100644 > --- a/drivers/pci/pci-acpi.c > +++ b/drivers/pci/pci-acpi.c > @@ -358,7 +358,7 @@ static void pci_acpi_cleanup(struct device *dev) > > static bool pci_acpi_bus_match(struct device *dev) > { > - return dev->bus == &pci_bus_type; > + return dev_is_pci(dev); > } > > static struct acpi_bus_type acpi_pci_bus = { > -- > 1.7.1 > > > -- > 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 -- 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 Mon, 2013-12-09 at 17:01 -0700, Bjorn Helgaas wrote: > [+cc arch lists] > > On Thu, Dec 05, 2013 at 07:52:53PM +0800, Yijing Wang wrote: > > Use dev_is_pci() instead of directly compare > > pci_bus_type to check whether it is pci device. > > > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> > > I applied all these to my pci/yijing-dev_is_pci branch for v3.14, thanks! > > Browse them here: http://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=pci/yijing-dev_is_pci Ah ok. I also have the powerpc one in powerpc -next, no biggie though Cheers, Ben. > This should be no functional change. > > arch/alpha/kernel/pci_iommu.c | 2 +- > arch/arm/common/it8152.c | 4 ++-- > arch/arm/mach-ixp4xx/common-pci.c | 6 +++--- > arch/ia64/hp/common/sba_iommu.c | 2 +- > arch/ia64/sn/pci/pci_dma.c | 24 ++++++++++++------------ > arch/parisc/kernel/drivers.c | 22 +++++----------------- > arch/powerpc/sysdev/fsl_pci.c | 2 +- > arch/sparc/include/asm/dma-mapping.h | 10 ++++------ > arch/sparc/kernel/iommu.c | 2 +- > arch/sparc/kernel/ioport.c | 4 +--- > arch/x86/kernel/acpi/boot.c | 4 +--- > drivers/pci/pci-acpi.c | 2 +- > 12 files changed, 33 insertions(+), 51 deletions(-) > > Bjorn > > > --- > > drivers/pci/pci-acpi.c | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c > > index 577074e..e0431f1 100644 > > --- a/drivers/pci/pci-acpi.c > > +++ b/drivers/pci/pci-acpi.c > > @@ -358,7 +358,7 @@ static void pci_acpi_cleanup(struct device *dev) > > > > static bool pci_acpi_bus_match(struct device *dev) > > { > > - return dev->bus == &pci_bus_type; > > + return dev_is_pci(dev); > > } > > > > static struct acpi_bus_type acpi_pci_bus = { > > -- > > 1.7.1 > > > > > > -- > > 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 > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev -- 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 2013/12/10 8:01, Bjorn Helgaas wrote: > [+cc arch lists] > > On Thu, Dec 05, 2013 at 07:52:53PM +0800, Yijing Wang wrote: >> Use dev_is_pci() instead of directly compare >> pci_bus_type to check whether it is pci device. >> >> Signed-off-by: Yijing Wang <wangyijing@huawei.com> > > I applied all these to my pci/yijing-dev_is_pci branch for v3.14, thanks! > > Browse them here: http://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=pci/yijing-dev_is_pci Thanks! Bjorn, I sent the "[patch v2 4/9] sparc/PCI: Use dev_is_pci() to identify PCI devices" to correct build error found by kbuild test, Because I have no sparc platform, I guess the build error was introduced by I remove the CONFIG_PCI #ifdef in that patch. Now I keep the CONFIG_PCI code and that patch should be no functional change. > > This should be no functional change. > > arch/alpha/kernel/pci_iommu.c | 2 +- > arch/arm/common/it8152.c | 4 ++-- > arch/arm/mach-ixp4xx/common-pci.c | 6 +++--- > arch/ia64/hp/common/sba_iommu.c | 2 +- > arch/ia64/sn/pci/pci_dma.c | 24 ++++++++++++------------ > arch/parisc/kernel/drivers.c | 22 +++++----------------- > arch/powerpc/sysdev/fsl_pci.c | 2 +- > arch/sparc/include/asm/dma-mapping.h | 10 ++++------ > arch/sparc/kernel/iommu.c | 2 +- > arch/sparc/kernel/ioport.c | 4 +--- > arch/x86/kernel/acpi/boot.c | 4 +--- > drivers/pci/pci-acpi.c | 2 +- > 12 files changed, 33 insertions(+), 51 deletions(-) > > Bjorn > >> --- >> drivers/pci/pci-acpi.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c >> index 577074e..e0431f1 100644 >> --- a/drivers/pci/pci-acpi.c >> +++ b/drivers/pci/pci-acpi.c >> @@ -358,7 +358,7 @@ static void pci_acpi_cleanup(struct device *dev) >> >> static bool pci_acpi_bus_match(struct device *dev) >> { >> - return dev->bus == &pci_bus_type; >> + return dev_is_pci(dev); >> } >> >> static struct acpi_bus_type acpi_pci_bus = { >> -- >> 1.7.1 >> >> >> -- >> 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 Mon, Dec 9, 2013 at 8:59 PM, Benjamin Herrenschmidt <benh@au1.ibm.com> wrote: > On Mon, 2013-12-09 at 17:01 -0700, Bjorn Helgaas wrote: >> [+cc arch lists] >> >> On Thu, Dec 05, 2013 at 07:52:53PM +0800, Yijing Wang wrote: >> > Use dev_is_pci() instead of directly compare >> > pci_bus_type to check whether it is pci device. >> > >> > Signed-off-by: Yijing Wang <wangyijing@huawei.com> >> >> I applied all these to my pci/yijing-dev_is_pci branch for v3.14, thanks! >> >> Browse them here: http://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=pci/yijing-dev_is_pci > > Ah ok. I also have the powerpc one in powerpc -next, no biggie though I'll drop the powerpc one. -- 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
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 577074e..e0431f1 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -358,7 +358,7 @@ static void pci_acpi_cleanup(struct device *dev) static bool pci_acpi_bus_match(struct device *dev) { - return dev->bus == &pci_bus_type; + return dev_is_pci(dev); } static struct acpi_bus_type acpi_pci_bus = {
Use dev_is_pci() instead of directly compare pci_bus_type to check whether it is pci device. Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- drivers/pci/pci-acpi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)