[PATCH] shpchp: fix oops at driver unload
rajesh.shah@intel.com [Thu, 13 Oct 2005 19:05:44 +0000 (12:05 -0700)]
At unload time, the shpchp driver does not remove sysfs files
it had created in the driver's probe entry point. This patch
fixes this problem.

Signed-off-by: Rajesh Shah <rajesh.shah@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/pci/hotplug/shpchp.h
drivers/pci/hotplug/shpchp_core.c
drivers/pci/hotplug/shpchp_sysfs.c

index dae1543..abe2cf4 100644 (file)
@@ -173,6 +173,7 @@ extern void get_hp_params_from_firmware(struct pci_dev *dev,
                struct hotplug_params *hpp);
 extern int     shpchprm_get_physical_slot_number(struct controller *ctrl,
                u32 *sun, u8 busnum, u8 devnum);
+extern void    shpchp_remove_ctrl_files(struct controller *ctrl);
 
 
 /* Global variables */
index 6a2b4a0..63628e0 100644 (file)
@@ -480,6 +480,7 @@ static void __exit unload_shpchpd(void)
        ctrl = shpchp_ctrl_list;
 
        while (ctrl) {
+               shpchp_remove_ctrl_files(ctrl);
                cleanup_slots(ctrl);
 
                kfree (ctrl->pci_bus);
index 807ef66..f5cfbf2 100644 (file)
@@ -89,3 +89,8 @@ void shpchp_create_ctrl_files (struct controller *ctrl)
 {
        device_create_file (&ctrl->pci_dev->dev, &dev_attr_ctrl);
 }
+
+void shpchp_remove_ctrl_files(struct controller *ctrl)
+{
+       device_remove_file(&ctrl->pci_dev->dev, &dev_attr_ctrl);
+}