diff options
author | Kees Cook <keescook@chromium.org> | 2017-09-21 13:12:15 -0700 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2017-10-27 02:22:00 -0700 |
commit | 13059106242bc96f8f5ab79c0f6cb15c7b756f40 (patch) | |
tree | d1e8a3c866b17d4b5b1c75b16e3d25de3f5a391a /drivers/scsi/fcoe/fcoe_transport.c | |
parent | af53b89becdcee2f15c60e6a9e951bd96d382e1c (diff) | |
download | linux-13059106242bc96f8f5ab79c0f6cb15c7b756f40.tar.gz linux-13059106242bc96f8f5ab79c0f6cb15c7b756f40.tar.bz2 linux-13059106242bc96f8f5ab79c0f6cb15c7b756f40.zip |
scsi: fcoe: 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: QLogic-Storage-Upstream@qlogic.com
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Johannes Thumshirn <jth@kernel.org>
Cc: linux-scsi@vger.kernel.org
Cc: fcoe-devel@open-fcoe.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Johannes Thumshirn <jth@kernel.org>
Diffstat (limited to 'drivers/scsi/fcoe/fcoe_transport.c')
-rw-r--r-- | drivers/scsi/fcoe/fcoe_transport.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/fcoe/fcoe_transport.c b/drivers/scsi/fcoe/fcoe_transport.c index 375c536cbc68..1ba5f51713a3 100644 --- a/drivers/scsi/fcoe/fcoe_transport.c +++ b/drivers/scsi/fcoe/fcoe_transport.c @@ -455,9 +455,11 @@ EXPORT_SYMBOL_GPL(fcoe_check_wait_queue); * * Calls fcoe_check_wait_queue on timeout */ -void fcoe_queue_timer(ulong lport) +void fcoe_queue_timer(struct timer_list *t) { - fcoe_check_wait_queue((struct fc_lport *)lport, NULL); + struct fcoe_port *port = from_timer(port, t, timer); + + fcoe_check_wait_queue(port->lport, NULL); } EXPORT_SYMBOL_GPL(fcoe_queue_timer); |