10 files changed, 274 insertions, 70 deletions

diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
index be104eced34c..7fff07e877c7 100644
--- a/drivers/pci/hotplug/acpiphp.h
+++ b/drivers/pci/hotplug/acpiphp.h
@@ -150,6 +150,11 @@ struct acpiphp_attention_info
         struct module *owner;
 };
 
+struct acpiphp_ioapic {
+        struct pci_dev *dev;
+        u32 gsi_base;
+        struct list_head list;
+};
 
 /* PCI bus bridge HID */
 #define ACPI_PCI_HOST_HID               "PNP0A03"
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index ae67a8f55ba1..83e8e4412de5 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -53,6 +53,8 @@
 #include "acpiphp.h"
 
 static LIST_HEAD(bridge_list);
+static LIST_HEAD(ioapic_list);
+static DEFINE_SPINLOCK(ioapic_list_lock);
 
 #define MY_NAME "acpiphp_glue"
 
@@ -797,6 +799,7 @@ ioapic_add(acpi_handle handle, u32 lvl, void *context, void **rv)
         struct pci_dev *pdev;
         u32 gsi_base;
         u64 phys_addr;
+        struct acpiphp_ioapic *ioapic;
 
         /* Evaluate _STA if present */
         status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
@@ -811,41 +814,107 @@ ioapic_add(acpi_handle handle, u32 lvl, void *context, void **rv)
         if (get_gsi_base(handle, &gsi_base))
                 return AE_OK;
 
+        ioapic = kmalloc(sizeof(*ioapic), GFP_KERNEL);
+        if (!ioapic)
+                return AE_NO_MEMORY;
+
         pdev = get_apic_pci_info(handle);
         if (!pdev)
-                return AE_OK;
+                goto exit_kfree;
 
-        if (pci_enable_device(pdev)) {
-                pci_dev_put(pdev);
-                return AE_OK;
-        }
+        if (pci_enable_device(pdev))
+                goto exit_pci_dev_put;
 
         pci_set_master(pdev);
 
-        if (pci_request_region(pdev, 0, "I/O APIC(acpiphp)")) {
-                pci_disable_device(pdev);
-                pci_dev_put(pdev);
-                return AE_OK;
-        }
+        if (pci_request_region(pdev, 0, "I/O APIC(acpiphp)"))
+                goto exit_pci_disable_device;
 
         phys_addr = pci_resource_start(pdev, 0);
-        if (acpi_register_ioapic(handle, phys_addr, gsi_base)) {
-                pci_release_region(pdev, 0);
-                pci_disable_device(pdev);
-                pci_dev_put(pdev);
+        if (acpi_register_ioapic(handle, phys_addr, gsi_base))
+                goto exit_pci_release_region;
+
+        ioapic->gsi_base = gsi_base;
+        ioapic->dev = pdev;
+        spin_lock(&ioapic_list_lock);
+        list_add_tail(&ioapic->list, &ioapic_list);
+        spin_unlock(&ioapic_list_lock);
+
+        return AE_OK;
+
+ exit_pci_release_region:
+        pci_release_region(pdev, 0);
+ exit_pci_disable_device:
+        pci_disable_device(pdev);
+ exit_pci_dev_put:
+        pci_dev_put(pdev);
+ exit_kfree:
+        kfree(ioapic);
+
+        return AE_OK;
+}
+
+static acpi_status
+ioapic_remove(acpi_handle handle, u32 lvl, void *context, void **rv)
+{
+        acpi_status status;
+        unsigned long sta;
+        acpi_handle tmp;
+        u32 gsi_base;
+        struct acpiphp_ioapic *pos, *n, *ioapic = NULL;
+
+        /* Evaluate _STA if present */
+        status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
+        if (ACPI_SUCCESS(status) && sta != ACPI_STA_ALL)
+                return AE_CTRL_DEPTH;
+
+        /* Scan only PCI bus scope */
+        status = acpi_get_handle(handle, "_HID", &tmp);
+        if (ACPI_SUCCESS(status))
+                return AE_CTRL_DEPTH;
+
+        if (get_gsi_base(handle, &gsi_base))
                 return AE_OK;
+
+        acpi_unregister_ioapic(handle, gsi_base);
+
+        spin_lock(&ioapic_list_lock);
+        list_for_each_entry_safe(pos, n, &ioapic_list, list) {
+                if (pos->gsi_base != gsi_base)
+                        continue;
+                ioapic = pos;
+                list_del(&ioapic->list);
+                break;
         }
+        spin_unlock(&ioapic_list_lock);
+
+        if (!ioapic)
+                return AE_OK;
+
+        pci_release_region(ioapic->dev, 0);
+        pci_disable_device(ioapic->dev);
+        pci_dev_put(ioapic->dev);
+        kfree(ioapic);
 
         return AE_OK;
 }
 
 static int acpiphp_configure_ioapics(acpi_handle handle)
 {
+        ioapic_add(handle, 0, NULL, NULL);
         acpi_walk_namespace(ACPI_TYPE_DEVICE, handle,
                             ACPI_UINT32_MAX, ioapic_add, NULL, NULL);
         return 0;
 }
 
+static int acpiphp_unconfigure_ioapics(acpi_handle handle)
+{
+        ioapic_remove(handle, 0, NULL, NULL);
+        acpi_walk_namespace(ACPI_TYPE_DEVICE, handle,
+                            ACPI_UINT32_MAX, ioapic_remove, NULL, NULL);
+        return 0;
+}
+
 static int power_on_slot(struct acpiphp_slot *slot)
 {
         acpi_status status;
@@ -997,7 +1066,7 @@ acpiphp_bus_add_out:
  * @handle: handle to acpi namespace
  *
  */
-int acpiphp_bus_trim(acpi_handle handle)
+static int acpiphp_bus_trim(acpi_handle handle)
 {
         struct acpi_device *device;
         int retval;
@@ -1074,10 +1143,11 @@ static int enable_device(struct acpiphp_slot *slot)
 
         pci_bus_assign_resources(bus);
         acpiphp_sanitize_bus(bus);
+        acpiphp_set_hpp_values(slot->bridge->handle, bus);
+        list_for_each_entry(func, &slot->funcs, sibling)
+                acpiphp_configure_ioapics(func->handle);
         pci_enable_bridges(bus);
         pci_bus_add_devices(bus);
-        acpiphp_set_hpp_values(slot->bridge->handle, bus);
-        acpiphp_configure_ioapics(slot->bridge->handle);
 
         /* associate pci_dev to our representation */
         list_for_each (l, &slot->funcs) {
@@ -1103,6 +1173,16 @@ static int enable_device(struct acpiphp_slot *slot)
         return retval;
 }
 
+static void disable_bridges(struct pci_bus *bus)
+{
+        struct pci_dev *dev;
+        list_for_each_entry(dev, &bus->devices, bus_list) {
+                if (dev->subordinate) {
+                        disable_bridges(dev->subordinate);
+                        pci_disable_device(dev);
+                }
+        }
+}
 
 /**
  * disable_device - disable a slot
@@ -1127,6 +1207,19 @@ static int disable_device(struct acpiphp_slot *slot)
                         func->bridge = NULL;
                 }
 
+                if (func->pci_dev) {
+                        pci_stop_bus_device(func->pci_dev);
+                        if (func->pci_dev->subordinate) {
+                                disable_bridges(func->pci_dev->subordinate);
+                                pci_disable_device(func->pci_dev);
+                        }
+                }
+        }
+
+        list_for_each (l, &slot->funcs) {
+                func = list_entry(l, struct acpiphp_func, sibling);
+
+                acpiphp_unconfigure_ioapics(func->handle);
                 acpiphp_bus_trim(func->handle);
                 /* try to remove anyway.
                  * acpiphp_bus_add might have been failed */
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index dd2b762777c4..05a4f0f90186 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -176,7 +176,9 @@ static void pci_rescan_slot(struct pci_dev *temp)
         struct pci_bus *bus = temp->bus;
         struct pci_dev *dev;
         int func;
+        int retval;
         u8 hdr_type;
+
         if (!pci_read_config_byte(temp, PCI_HEADER_TYPE, &hdr_type)) {
                 temp->hdr_type = hdr_type & 0x7f;
                 if (!pci_find_slot(bus->number, temp->devfn)) {
@@ -185,8 +187,12 @@ static void pci_rescan_slot(struct pci_dev *temp)
                                 dbg("New device on %s function %x:%x\n",
                                         bus->name, temp->devfn >> 3,
                                         temp->devfn & 7);
-                                pci_bus_add_device(dev);
-                                add_slot(dev);
+                                retval = pci_bus_add_device(dev);
+                                if (retval)
+                                        dev_err(&dev->dev, "error adding "
+                                                "device, continuing.\n");
+                                else
+                                        add_slot(dev);
                         }
                 }
                 /* multifunction device? */
@@ -205,8 +211,12 @@ static void pci_rescan_slot(struct pci_dev *temp)
                                         dbg("New device on %s function %x:%x\n",
                                                 bus->name, temp->devfn >> 3,
                                                 temp->devfn & 7);
-                                        pci_bus_add_device(dev);
-                                        add_slot(dev);
+                                        retval = pci_bus_add_device(dev);
+                                        if (retval)
+                                                dev_err(&dev->dev, "error adding "
+                                                        "device, continuing.\n");
+                                        else
+                                                add_slot(dev);
                                 }
                         }
                 }
diff --git a/drivers/pci/hotplug/pci_hotplug.h b/drivers/pci/hotplug/pci_hotplug.h
index e929b7c11429..772523dc3860 100644
--- a/drivers/pci/hotplug/pci_hotplug.h
+++ b/drivers/pci/hotplug/pci_hotplug.h
@@ -172,8 +172,8 @@ struct hotplug_slot {
 
 extern int pci_hp_register              (struct hotplug_slot *slot);
 extern int pci_hp_deregister            (struct hotplug_slot *slot);
-extern int pci_hp_change_slot_info      (struct hotplug_slot *slot,
-                                         struct hotplug_slot_info *info);
+extern int __must_check pci_hp_change_slot_info (struct hotplug_slot *slot,
+                                                 struct hotplug_slot_info *info);
 extern struct subsystem pci_hotplug_slots_subsys;
 
 /* PCI Setting Record (Type 0) */
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index b7b378df89e3..e2823ea9c4ed 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -482,31 +482,95 @@ static int has_test_file (struct hotplug_slot *slot)
 
 static int fs_add_slot (struct hotplug_slot *slot)
 {
-        if (has_power_file(slot) == 0)
-                sysfs_create_file(&slot->kobj, &hotplug_slot_attr_power.attr);
+        int retval = 0;
 
-        if (has_attention_file(slot) == 0)
-                sysfs_create_file(&slot->kobj, &hotplug_slot_attr_attention.attr);
+        if (has_power_file(slot) == 0) {
+                retval = sysfs_create_file(&slot->kobj, &hotplug_slot_attr_power.attr);
+                if (retval)
+                        goto exit_power;
+        }
 
-        if (has_latch_file(slot) == 0)
-                sysfs_create_file(&slot->kobj, &hotplug_slot_attr_latch.attr);
+        if (has_attention_file(slot) == 0) {
+                retval = sysfs_create_file(&slot->kobj,
+                                           &hotplug_slot_attr_attention.attr);
+                if (retval)
+                        goto exit_attention;
+        }
 
-        if (has_adapter_file(slot) == 0)
-                sysfs_create_file(&slot->kobj, &hotplug_slot_attr_presence.attr);
+        if (has_latch_file(slot) == 0) {
+                retval = sysfs_create_file(&slot->kobj,
+                                           &hotplug_slot_attr_latch.attr);
+                if (retval)
+                        goto exit_latch;
+        }
 
-        if (has_address_file(slot) == 0)
-                sysfs_create_file(&slot->kobj, &hotplug_slot_attr_address.attr);
+        if (has_adapter_file(slot) == 0) {
+                retval = sysfs_create_file(&slot->kobj,
+                                           &hotplug_slot_attr_presence.attr);
+                if (retval)
+                        goto exit_adapter;
+        }
 
-        if (has_max_bus_speed_file(slot) == 0)
-                sysfs_create_file(&slot->kobj, &hotplug_slot_attr_max_bus_speed.attr);
+        if (has_address_file(slot) == 0) {
+                retval = sysfs_create_file(&slot->kobj,
+                                           &hotplug_slot_attr_address.attr);
+                if (retval)
+                        goto exit_address;
+        }
 
+        if (has_max_bus_speed_file(slot) == 0) {
+                retval = sysfs_create_file(&slot->kobj,
+                                           &hotplug_slot_attr_max_bus_speed.attr);
+                if (retval)
+                        goto exit_max_speed;
+        }
+
+        if (has_cur_bus_speed_file(slot) == 0) {
+                retval = sysfs_create_file(&slot->kobj,
+                                           &hotplug_slot_attr_cur_bus_speed.attr);
+                if (retval)
+                        goto exit_cur_speed;
+        }
+
+        if (has_test_file(slot) == 0) {
+                retval = sysfs_create_file(&slot->kobj,
+                                           &hotplug_slot_attr_test.attr);
+                if (retval)
+                        goto exit_test;
+        }
+
+        goto exit;
+
+exit_test:
         if (has_cur_bus_speed_file(slot) == 0)
-                sysfs_create_file(&slot->kobj, &hotplug_slot_attr_cur_bus_speed.attr);
+                sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_cur_bus_speed.attr);
 
-        if (has_test_file(slot) == 0)
-                sysfs_create_file(&slot->kobj, &hotplug_slot_attr_test.attr);
+exit_cur_speed:
+        if (has_max_bus_speed_file(slot) == 0)
+                sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_max_bus_speed.attr);
 
-        return 0;
+exit_max_speed:
+        if (has_address_file(slot) == 0)
+                sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_address.attr);
+
+exit_address:
+        if (has_adapter_file(slot) == 0)
+                sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_presence.attr);
+
+exit_adapter:
+        if (has_latch_file(slot) == 0)
+                sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_latch.attr);
+
+exit_latch:
+        if (has_attention_file(slot) == 0)
+                sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_attention.attr);
+
+exit_attention:
+        if (has_power_file(slot) == 0)
+                sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_power.attr);
+exit_power:
+exit:
+        return retval;
 }
 
 static void fs_remove_slot (struct hotplug_slot *slot)
@@ -626,8 +690,11 @@ int pci_hp_deregister (struct hotplug_slot *slot)
  *
  * Returns 0 if successful, anything else for an error.
  */
-int pci_hp_change_slot_info (struct hotplug_slot *slot, struct hotplug_slot_info *info)
+int __must_check pci_hp_change_slot_info(struct hotplug_slot *slot,
+                                         struct hotplug_slot_info *info)
 {
+        int retval;
+
         if ((slot == NULL) || (info == NULL))
                 return -ENODEV;
 
@@ -636,32 +703,60 @@ int pci_hp_change_slot_info (struct hotplug_slot *slot, struct hotplug_slot_info
         * for the files referring to the fields that have now changed.
         */
         if ((has_power_file(slot) == 0) &&
-            (slot->info->power_status != info->power_status))
-                sysfs_update_file(&slot->kobj, &hotplug_slot_attr_power.attr);
+            (slot->info->power_status != info->power_status)) {
+                retval = sysfs_update_file(&slot->kobj,
+                                           &hotplug_slot_attr_power.attr);
+                if (retval)
+                        return retval;
+        }
 
         if ((has_attention_file(slot) == 0) &&
-            (slot->info->attention_status != info->attention_status))
-                sysfs_update_file(&slot->kobj, &hotplug_slot_attr_attention.attr);
+            (slot->info->attention_status != info->attention_status)) {
+                retval = sysfs_update_file(&slot->kobj,
+                                           &hotplug_slot_attr_attention.attr);
+                if (retval)
+                        return retval;
+        }
 
         if ((has_latch_file(slot) == 0) &&
-            (slot->info->latch_status != info->latch_status))
-                sysfs_update_file(&slot->kobj, &hotplug_slot_attr_latch.attr);
+            (slot->info->latch_status != info->latch_status)) {
+                retval = sysfs_update_file(&slot->kobj,
+                                           &hotplug_slot_attr_latch.attr);
+                if (retval)
+                        return retval;
+        }
 
         if ((has_adapter_file(slot) == 0) &&
-            (slot->info->adapter_status != info->adapter_status))
-                sysfs_update_file(&slot->kobj, &hotplug_slot_attr_presence.attr);
+            (slot->info->adapter_status != info->adapter_status)) {
+                retval = sysfs_update_file(&slot->kobj,
+                                           &hotplug_slot_attr_presence.attr);
+                if (retval)
+                        return retval;
+        }
 
         if ((has_address_file(slot) == 0) &&
-            (slot->info->address != info->address))
-                sysfs_update_file(&slot->kobj, &hotplug_slot_attr_address.attr);
+            (slot->info->address != info->address)) {
+                retval = sysfs_update_file(&slot->kobj,
+                                           &hotplug_slot_attr_address.attr);
+                if (retval)
+                        return retval;
+        }
 
         if ((has_max_bus_speed_file(slot) == 0) &&
-            (slot->info->max_bus_speed != info->max_bus_speed))
-                sysfs_update_file(&slot->kobj, &hotplug_slot_attr_max_bus_speed.attr);
+            (slot->info->max_bus_speed != info->max_bus_speed)) {
+                retval = sysfs_update_file(&slot->kobj,
+                                           &hotplug_slot_attr_max_bus_speed.attr);
+                if (retval)
+                        return retval;
+        }
 
         if ((has_cur_bus_speed_file(slot) == 0) &&
-            (slot->info->cur_bus_speed != info->cur_bus_speed))
-                sysfs_update_file(&slot->kobj, &hotplug_slot_attr_cur_bus_speed.attr);
+            (slot->info->cur_bus_speed != info->cur_bus_speed)) {
+                retval = sysfs_update_file(&slot->kobj,
+                                           &hotplug_slot_attr_cur_bus_speed.attr);
+                if (retval)
+                        return retval;
+        }
 
         memcpy (slot->info, info, sizeof (struct hotplug_slot_info));
 
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 33d198768356..41290a106bd8 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -762,14 +762,14 @@ int pciehp_enable_slot(struct slot *p_slot)
         if (rc || !getstatus) {
                 info("%s: no adapter on slot(%x)\n", __FUNCTION__, p_slot->number);
                 mutex_unlock(&p_slot->ctrl->crit_sect);
-                return 1;
+                return -ENODEV;
         }
         if (MRL_SENS(p_slot->ctrl->ctrlcap)) {  
                 rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
                 if (rc || getstatus) {
                         info("%s: latch open on slot(%x)\n", __FUNCTION__, p_slot->number);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
-                        return 1;
+                        return -ENODEV;
                 }
         }
         
@@ -778,7 +778,7 @@ int pciehp_enable_slot(struct slot *p_slot)
                 if (rc || getstatus) {
                         info("%s: already enabled on slot(%x)\n", __FUNCTION__, p_slot->number);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
-                        return 1;
+                        return -EINVAL;
                 }
         }
         mutex_unlock(&p_slot->ctrl->crit_sect);
@@ -813,7 +813,7 @@ int pciehp_disable_slot(struct slot *p_slot)
                 if (ret || !getstatus) {
                         info("%s: no adapter on slot(%x)\n", __FUNCTION__, p_slot->number);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
-                        return 1;
+                        return -ENODEV;
                 }
         }
 
@@ -822,7 +822,7 @@ int pciehp_disable_slot(struct slot *p_slot)
                 if (ret || getstatus) {
                         info("%s: latch open on slot(%x)\n", __FUNCTION__, p_slot->number);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
-                        return 1;
+                        return -ENODEV;
                 }
         }
 
@@ -831,7 +831,7 @@ int pciehp_disable_slot(struct slot *p_slot)
                 if (ret || !getstatus) {
                         info("%s: already disabled slot(%x)\n", __FUNCTION__, p_slot->number);
                         mutex_unlock(&p_slot->ctrl->crit_sect);
-                        return 1;
+                        return -EINVAL;
                 }
         }
 
diff --git a/drivers/pci/hotplug/pcihp_skeleton.c b/drivers/pci/hotplug/pcihp_skeleton.c
index 8ad446605f75..2b9e10e38613 100644
--- a/drivers/pci/hotplug/pcihp_skeleton.c
+++ b/drivers/pci/hotplug/pcihp_skeleton.c
@@ -1,5 +1,5 @@
 /*
- * PCI Hot Plug Controller Skeleton Driver - 0.2
+ * PCI Hot Plug Controller Skeleton Driver - 0.3
  *
  * Copyright (C) 2001,2003 Greg Kroah-Hartman (greg@kroah.com)
  * Copyright (C) 2001,2003 IBM Corp.
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * This driver is to be used as a skeleton driver to be show how to interface
+ * This driver is to be used as a skeleton driver to show how to interface
  * with the pci hotplug core easily.
  *
  * Send feedback to <greg@kroah.com>
@@ -58,8 +58,6 @@ static LIST_HEAD(slot_list);
 #define info(format, arg...) printk(KERN_INFO "%s: " format "\n", MY_NAME , ## arg)
 #define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)
 
-
-
 /* local variables */
 static int debug;
 static int num_slots;
@@ -109,7 +107,6 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
         return retval;
 }
 
-
 static int disable_slot(struct hotplug_slot *hotplug_slot)
 {
         struct slot *slot = hotplug_slot->private;
@@ -342,7 +339,7 @@ static int __init pcihp_skel_init(void)
         info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
         /*
          * Do specific initialization stuff for your driver here
-         * Like initializing your controller hardware (if any) and
+         * like initializing your controller hardware (if any) and
          * determining the number of slots you have in the system
          * right now.
          */
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index 7208b95c6ee7..c7103ac5cd06 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -173,7 +173,7 @@ struct controller {
 #define msg_button_cancel       "PCI slot #%s - action canceled due to button press.\n"
 
 /* sysfs functions for the hotplug controller info */
-extern void shpchp_create_ctrl_files    (struct controller *ctrl);
+extern int __must_check shpchp_create_ctrl_files(struct controller *ctrl);
 
 extern int      shpchp_sysfs_enable_slot(struct slot *slot);
 extern int      shpchp_sysfs_disable_slot(struct slot *slot);
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index a14e7de19846..235c18a22393 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -449,10 +449,14 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 ctrl->speed = PCI_SPEED_33MHz;
         }
 
-        shpchp_create_ctrl_files(ctrl);
+        rc = shpchp_create_ctrl_files(ctrl);
+        if (rc)
+                goto err_cleanup_slots;
 
         return 0;
 
+err_cleanup_slots:
+        cleanup_slots(ctrl);
 err_out_release_ctlr:
         ctrl->hpc_ops->release_ctlr(ctrl);
 err_out_free_ctrl:
diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpchp_sysfs.c
index 620e1139e607..29fa9d26adae 100644
--- a/drivers/pci/hotplug/shpchp_sysfs.c
+++ b/drivers/pci/hotplug/shpchp_sysfs.c
@@ -91,9 +91,9 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha
 }
 static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL);
 
-void shpchp_create_ctrl_files (struct controller *ctrl)
+int __must_check shpchp_create_ctrl_files (struct controller *ctrl)
 {
-        device_create_file (&ctrl->pci_dev->dev, &dev_attr_ctrl);
+        return device_create_file (&ctrl->pci_dev->dev, &dev_attr_ctrl);
 }
 
 void shpchp_remove_ctrl_files(struct controller *ctrl)