diff options
| author | Kees Cook <keescook@chromium.org> | 2017-09-01 23:21:24 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-10-27 02:22:00 -0700 |
| commit | b0a2dc66152aa409860e02804169b0007244ebd7 (patch) | |
| tree | 025474155e15f628c09530928c28df10ac43c272 /drivers/scsi/isci/isci.h | |
| parent | 7932589f47d5d5eaa9948bd479b42819b6b10509 (diff) | |
scsi: isci: 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.
Cc: Intel SCU Linux support <intel-linux-scu@intel.com>
Cc: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Diffstat (limited to 'drivers/scsi/isci/isci.h')
| -rw-r--r-- | drivers/scsi/isci/isci.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/isci/isci.h b/drivers/scsi/isci/isci.h index 234ab46fce33..680e30947671 100644 --- a/drivers/scsi/isci/isci.h +++ b/drivers/scsi/isci/isci.h @@ -498,12 +498,10 @@ struct sci_timer { }; static inline -void sci_init_timer(struct sci_timer *tmr, void (*fn)(unsigned long)) +void sci_init_timer(struct sci_timer *tmr, void (*fn)(struct timer_list *t)) { - tmr->timer.function = fn; - tmr->timer.data = (unsigned long) tmr; tmr->cancel = 0; - init_timer(&tmr->timer); + timer_setup(&tmr->timer, fn, 0); } static inline void sci_mod_timer(struct sci_timer *tmr, unsigned long msec) |