[patch] shpchp: support driver remove

[Kristen Accardi]

This patch will add remove support to the shpchp driver.  It also changes
where the shpchpd thread is started, so that the thread is only started if
a valid controller is enabled. 

Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@xxxxxxxxx>


 drivers/pci/hotplug/shpchp_core.c |   59 ++++++++++++++++++--------------------
 1 files changed, 29 insertions(+), 30 deletions(-)

--- linux-shpchp-mm.orig/drivers/pci/hotplug/shpchp_core.c
+++ linux-shpchp-mm/drivers/pci/hotplug/shpchp_core.c
@@ -437,13 +437,21 @@ static int shpc_probe(struct pci_dev *pd
 
 	/* Finish setting up the hot plug ctrl device */
 	ctrl->next_event = 0;
+	if (list_empty(&shpchp_ctrl_list)) {
+		rc = shpc_start_thread();
+		if (rc) {
+			err(SHPC_MODULE_NAME ": Can't start event thread.\n");
+			goto err_out_stop_thread;
+		}
+	}
 
 	list_add(&ctrl->ctrl_list, &shpchp_ctrl_list);
-
 	shpchp_create_ctrl_files(ctrl);
 
 	return 0;
 
+err_out_stop_thread:
+	shpchp_event_stop_thread();
 err_out_free_ctrl_slot:
 	cleanup_slots(ctrl);
 err_out_free_ctrl_bus:
@@ -471,26 +479,29 @@ static int shpc_start_thread(void)
 	return retval;
 }
 
-static void __exit unload_shpchpd(void)
+
+static void __devexit shpc_remove_ctrl(struct controller *ctrl)
 {
-	struct list_head *tmp;
-	struct list_head *next;
-	struct controller *ctrl;
-
-	list_for_each_safe(tmp, next, &shpchp_ctrl_list) {
-		ctrl = list_entry(tmp, struct controller, ctrl_list);
-		shpchp_remove_ctrl_files(ctrl);
-		cleanup_slots(ctrl);
-		kfree (ctrl->pci_bus);
-		ctrl->hpc_ops->release_ctlr(ctrl);
-		kfree(ctrl);
-	}
+	shpchp_remove_ctrl_files(ctrl);
+	cleanup_slots(ctrl);
+	kfree(ctrl->pci_bus);
+	ctrl->hpc_ops->release_ctlr(ctrl);
+	list_del(&ctrl->ctrl_list);
+	kfree(ctrl);
+}
 
-	/* Stop the notification mechanism */
-	shpchp_event_stop_thread();
 
+
+static void __devexit shpc_remove(struct pci_dev *pdev)
+{
+	struct controller *ctrl = pci_get_drvdata(pdev);
+	if (ctrl)
+		shpc_remove_ctrl(ctrl);
+	if (list_empty(&shpchp_ctrl_list))
+		shpchp_event_stop_thread();
 }
 
+
 static struct pci_device_id shpcd_pci_tbl[] = {
 	{PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0)},
 	{ /* end: all zeroes */ }
@@ -501,39 +512,27 @@ static struct pci_driver shpc_driver = {
 	.name =		SHPC_MODULE_NAME,
 	.id_table =	shpcd_pci_tbl,
 	.probe =	shpc_probe,
-	/* remove:	shpc_remove_one, */
+	.remove =	__devexit_p(shpc_remove),
 };
 
 static int __init shpcd_init(void)
 {
-	int retval = 0;
+	int retval;
 
 #ifdef CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE
 	shpchp_poll_mode = 1;
 #endif
 
-	retval = shpc_start_thread();
-	if (retval)
-		goto error_hpc_init;
-
 	retval = pci_register_driver(&shpc_driver);
 	dbg("%s: pci_register_driver = %d\n", __FUNCTION__, retval);
 	info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
 
-error_hpc_init:
-	if (retval) {
-		shpchp_event_stop_thread();
-	}
 	return retval;
 }
 
 static void __exit shpcd_cleanup(void)
 {
-	dbg("unload_shpchpd()\n");
-	unload_shpchpd();
-
 	pci_unregister_driver(&shpc_driver);
-
 	info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");
 }
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/