1 files changed, 11 insertions, 9 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 0bb4b4dced76..b5f2da6ac80e 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -914,7 +914,7 @@ static unsigned int ata_id_xfermask(const u16 *id)
  *      ata_port_queue_task - Queue port_task
  *      @ap: The ata_port to queue port_task for
  *      @fn: workqueue function to be scheduled
- *      @data: data value to pass to workqueue function
+ *      @data: data for @fn to use
  *      @delay: delay time for workqueue function
  *
  *      Schedule @fn(@data) for execution after @delay jiffies using
@@ -929,7 +929,7 @@ static unsigned int ata_id_xfermask(const u16 *id)
  *      LOCKING:
  *      Inherited from caller.
  */
-void ata_port_queue_task(struct ata_port *ap, void (*fn)(void *), void *data,
+void ata_port_queue_task(struct ata_port *ap, work_func_t fn, void *data,
                          unsigned long delay)
 {
         int rc;
@@ -937,7 +937,8 @@ void ata_port_queue_task(struct ata_port *ap, void (*fn)(void *), void *data,
         if (ap->pflags & ATA_PFLAG_FLUSH_PORT_TASK)
                 return;
 
-        PREPARE_DELAYED_WORK(&ap->port_task, fn, data);
+        PREPARE_DELAYED_WORK(&ap->port_task, fn);
+        ap->port_task_data = data;
 
         rc = queue_delayed_work(ata_wq, &ap->port_task, delay);
 
@@ -4292,10 +4293,11 @@ fsm_start:
         return poll_next;
 }
 
-static void ata_pio_task(void *_data)
+static void ata_pio_task(struct work_struct *work)
 {
-        struct ata_queued_cmd *qc = _data;
-        struct ata_port *ap = qc->ap;
+        struct ata_port *ap =
+                container_of(work, struct ata_port, port_task.work);
+        struct ata_queued_cmd *qc = ap->port_task_data;
         u8 status;
         int poll_next;
 
@@ -5317,9 +5319,9 @@ void ata_port_init(struct ata_port *ap, struct ata_host *host,
         ap->msg_enable = ATA_MSG_DRV | ATA_MSG_ERR | ATA_MSG_WARN;
 #endif
 
-        INIT_DELAYED_WORK(&ap->port_task, NULL, NULL);
-        INIT_DELAYED_WORK(&ap->hotplug_task, ata_scsi_hotplug, ap);
-        INIT_WORK(&ap->scsi_rescan_task, ata_scsi_dev_rescan, ap);
+        INIT_DELAYED_WORK(&ap->port_task, NULL);
+        INIT_DELAYED_WORK(&ap->hotplug_task, ata_scsi_hotplug);
+        INIT_WORK(&ap->scsi_rescan_task, ata_scsi_dev_rescan);
         INIT_LIST_HEAD(&ap->eh_done_q);
         init_waitqueue_head(&ap->eh_wait_q);