|
@@ -2060,9 +2060,9 @@ megasas_service_aen(struct megasas_instance *instance, struct megasas_cmd *cmd)
|
|
|
} else {
|
|
|
ev->instance = instance;
|
|
|
instance->ev = ev;
|
|
|
- INIT_WORK(&ev->hotplug_work, megasas_aen_polling);
|
|
|
- schedule_delayed_work(
|
|
|
- (struct delayed_work *)&ev->hotplug_work, 0);
|
|
|
+ INIT_DELAYED_WORK(&ev->hotplug_work,
|
|
|
+ megasas_aen_polling);
|
|
|
+ schedule_delayed_work(&ev->hotplug_work, 0);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -4352,8 +4352,7 @@ megasas_suspend(struct pci_dev *pdev, pm_message_t state)
|
|
|
/* cancel the delayed work if this work still in queue */
|
|
|
if (instance->ev != NULL) {
|
|
|
struct megasas_aen_event *ev = instance->ev;
|
|
|
- cancel_delayed_work_sync(
|
|
|
- (struct delayed_work *)&ev->hotplug_work);
|
|
|
+ cancel_delayed_work_sync(&ev->hotplug_work);
|
|
|
instance->ev = NULL;
|
|
|
}
|
|
|
|
|
@@ -4545,8 +4544,7 @@ static void __devexit megasas_detach_one(struct pci_dev *pdev)
|
|
|
/* cancel the delayed work if this work still in queue*/
|
|
|
if (instance->ev != NULL) {
|
|
|
struct megasas_aen_event *ev = instance->ev;
|
|
|
- cancel_delayed_work_sync(
|
|
|
- (struct delayed_work *)&ev->hotplug_work);
|
|
|
+ cancel_delayed_work_sync(&ev->hotplug_work);
|
|
|
instance->ev = NULL;
|
|
|
}
|
|
|
|
|
@@ -5190,7 +5188,7 @@ static void
|
|
|
megasas_aen_polling(struct work_struct *work)
|
|
|
{
|
|
|
struct megasas_aen_event *ev =
|
|
|
- container_of(work, struct megasas_aen_event, hotplug_work);
|
|
|
+ container_of(work, struct megasas_aen_event, hotplug_work.work);
|
|
|
struct megasas_instance *instance = ev->instance;
|
|
|
union megasas_evt_class_locale class_locale;
|
|
|
struct Scsi_Host *host;
|