uwb: Use dev_is_pci() to check whether it is pci device

Use PCI standard marco 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/uwb/umc-bus.c b/drivers/uwb/umc-bus.c
index e3ed6ff..88a290f 100644 (file)
--- a/drivers/uwb/umc-bus.c
+++ b/drivers/uwb/umc-bus.c
@@ -85,7 +85,7 @@ int umc_match_pci_id(struct umc_driver *umc_drv, struct umc_dev *umc)
        const struct pci_device_id *id_table = umc_drv->match_data;
        struct pci_dev *pci;
 
-       if (umc->dev.parent->bus != &pci_bus_type)
+       if (!dev_is_pci(umc->dev.parent))
                return 0;
 
        pci = to_pci_dev(umc->dev.parent);

diff --git a/include/linux/uwb/umc.h b/include/linux/uwb/umc.h
index 891d1d5..ba82f03 100644 (file)
--- a/include/linux/uwb/umc.h
+++ b/include/linux/uwb/umc.h
@@ -143,7 +143,7 @@ int umc_match_pci_id(struct umc_driver *umc_drv, struct umc_dev *umc);
 static inline struct pci_dev *umc_parent_pci_dev(struct umc_dev *umc_dev)
 {
        struct pci_dev *pci_dev = NULL;
-       if (umc_dev->dev.parent->bus == &pci_bus_type)
+       if (dev_is_pci(umc_dev->dev.parent))
                pci_dev = to_pci_dev(umc_dev->dev.parent);
        return pci_dev;
 }