aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libsas/sas_init.c
diff options
context:
space:
mode:
authorKees Cook <[email protected]>2017-08-22 23:05:14 +0000
committerKees Cook <[email protected]>2017-11-01 18:43:47 +0000
commit77570eedd92adfcf69fdde31183a56324f82ca5c (patch)
tree25b05550e8c7f4a97e30ea90429f69459ec10e80 /drivers/scsi/libsas/sas_init.c
parentscsi: pmcraid: Convert timers to use timer_setup() (diff)
downloadkernel-77570eedd92adfcf69fdde31183a56324f82ca5c.tar.gz
kernel-77570eedd92adfcf69fdde31183a56324f82ca5c.zip
scsi: sas: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. This requires adding a pointer to hold the timer's target task, as there isn't a link back from slow_task. Cc: John Garry <[email protected]> Cc: "James E.J. Bottomley" <[email protected]> Cc: "Martin K. Petersen" <[email protected]> Cc: Jack Wang <[email protected]> Cc: [email protected] Cc: Jens Axboe <[email protected]> Cc: Hannes Reinecke <[email protected]> Cc: Johannes Thumshirn <[email protected]> Cc: Benjamin Block <[email protected]> Cc: Baoyou Xie <[email protected]> Cc: Wei Yongjun <[email protected]> Cc: [email protected] Signed-off-by: Kees Cook <[email protected]> Reviewed-by: Martin K. Petersen <[email protected]> Acked-by: John Garry <[email protected]> # for hisi_sas part Tested-by: John Garry <[email protected]> # basic sanity test for hisi_sas Reviewed-by: Jack Wang <[email protected]>
Diffstat (limited to 'drivers/scsi/libsas/sas_init.c')
-rw-r--r--drivers/scsi/libsas/sas_init.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index 64e9cdda1c3c..681fcb837354 100644
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -66,7 +66,8 @@ struct sas_task *sas_alloc_slow_task(gfp_t flags)
}
task->slow_task = slow;
- init_timer(&slow->timer);
+ slow->task = task;
+ timer_setup(&slow->timer, NULL, 0);
init_completion(&slow->completion);
return task;