|
@@ -40,7 +40,6 @@ bool shpchp_debug;
|
|
|
bool shpchp_poll_mode;
|
|
|
int shpchp_poll_time;
|
|
|
struct workqueue_struct *shpchp_wq;
|
|
|
-struct workqueue_struct *shpchp_ordered_wq;
|
|
|
|
|
|
#define DRIVER_VERSION "0.4"
|
|
|
#define DRIVER_AUTHOR "Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>"
|
|
@@ -181,7 +180,6 @@ void cleanup_slots(struct controller *ctrl)
|
|
|
list_del(&slot->slot_list);
|
|
|
cancel_delayed_work(&slot->work);
|
|
|
flush_workqueue(shpchp_wq);
|
|
|
- flush_workqueue(shpchp_ordered_wq);
|
|
|
pci_hp_deregister(slot->hotplug_slot);
|
|
|
}
|
|
|
}
|
|
@@ -370,17 +368,10 @@ static int __init shpcd_init(void)
|
|
|
if (!shpchp_wq)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
- shpchp_ordered_wq = alloc_ordered_workqueue("shpchp_ordered", 0);
|
|
|
- if (!shpchp_ordered_wq) {
|
|
|
- destroy_workqueue(shpchp_wq);
|
|
|
- return -ENOMEM;
|
|
|
- }
|
|
|
-
|
|
|
retval = pci_register_driver(&shpc_driver);
|
|
|
dbg("%s: pci_register_driver = %d\n", __func__, retval);
|
|
|
info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
|
|
|
if (retval) {
|
|
|
- destroy_workqueue(shpchp_ordered_wq);
|
|
|
destroy_workqueue(shpchp_wq);
|
|
|
}
|
|
|
return retval;
|
|
@@ -390,7 +381,6 @@ static void __exit shpcd_cleanup(void)
|
|
|
{
|
|
|
dbg("unload_shpchpd()\n");
|
|
|
pci_unregister_driver(&shpc_driver);
|
|
|
- destroy_workqueue(shpchp_ordered_wq);
|
|
|
destroy_workqueue(shpchp_wq);
|
|
|
info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");
|
|
|
}
|