4 files changed, 7 insertions, 18 deletions

diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index 5317e4d7d96e..17d10e2e8fb6 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -135,7 +135,7 @@ static int __init init_legacy(void)
         struct pci_dev *pdev = NULL;
 
         /* Add existing devices */
-        while ((pdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pdev)))
+        for_each_pci_dev(pdev)
                 legacy_add_slot(pdev);
 
         /* Be alerted of any new ones */
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c
index 2fce726758d2..a4031dfe938e 100644
--- a/drivers/pci/hotplug/pciehp_pci.c
+++ b/drivers/pci/hotplug/pciehp_pci.c
@@ -137,7 +137,7 @@ int pciehp_unconfigure_device(struct slot *p_slot)
                                          "Cannot remove display device %s\n",
                                          pci_name(temp));
                                 pci_dev_put(temp);
-                                rc = EINVAL;
+                                rc = -EINVAL;
                                 break;
                         }
                 }
diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c
index 5f5e8d2e3552..d3985e7deab7 100644
--- a/drivers/pci/hotplug/shpchp_hpc.c
+++ b/drivers/pci/hotplug/shpchp_hpc.c
@@ -113,7 +113,7 @@
 #define CON_PFAULT_INTR_MASK    (1 << 28)
 #define MRL_CHANGE_SERR_MASK    (1 << 29)
 #define CON_PFAULT_SERR_MASK    (1 << 30)
-#define SLOT_REG_RSVDZ_MASK     (1 << 15) | (7 << 21)
+#define SLOT_REG_RSVDZ_MASK     ((1 << 15) | (7 << 21))
 
 /*
  * SHPC Command Code definitnions
diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c
index 8c3d3219f227..a2ccfcd3c298 100644
--- a/drivers/pci/hotplug/shpchp_pci.c
+++ b/drivers/pci/hotplug/shpchp_pci.c
@@ -60,12 +60,6 @@ int __ref shpchp_configure_device(struct slot *p_slot)
                 dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, fn));
                 if (!dev)
                         continue;
-                if ((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
-                        ctrl_err(ctrl, "Cannot hot-add display device %s\n",
-                                 pci_name(dev));
-                        pci_dev_put(dev);
-                        continue;
-                }
                 if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||
                                 (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) {
                         /* Find an unused bus number for the new bridge */
@@ -114,17 +108,11 @@ int shpchp_unconfigure_device(struct slot *p_slot)
         ctrl_dbg(ctrl, "%s: domain:bus:dev = %04x:%02x:%02x\n",
                  __func__, pci_domain_nr(parent), p_slot->bus, p_slot->device);
 
-        for (j=0; j<8 ; j++) {
-                struct pci_dev* temp = pci_get_slot(parent,
+        for (j = 0; j < 8 ; j++) {
+                struct pci_dev *temp = pci_get_slot(parent,
                                 (p_slot->device << 3) | j);
                 if (!temp)
                         continue;
-                if ((temp->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
-                        ctrl_err(ctrl, "Cannot remove display device %s\n",
-                                 pci_name(temp));
-                        pci_dev_put(temp);
-                        continue;
-                }
                 if (temp->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
                         pci_read_config_byte(temp, PCI_BRIDGE_CONTROL, &bctl);
                         if (bctl & PCI_BRIDGE_CTL_VGA) {
@@ -132,7 +120,8 @@ int shpchp_unconfigure_device(struct slot *p_slot)
                                          "Cannot remove display device %s\n",
                                          pci_name(temp));
                                 pci_dev_put(temp);
-                                continue;
+                                rc = -EINVAL;
+                                break;
                         }
                 }
                 pci_remove_bus_device(temp);