summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/csiostor/csio_mb.h
diff options
context:
space:
mode:
authorKees Cook2017-10-23 00:15:33 +0200
committerKees Cook2017-11-01 19:27:04 +0100
commitfa60a31b0cf07794d643924328cd7e3a78e99aca (patch)
treeee6a3a1bfe2a7cfc034d9e1a6a70d37c5b76cf99 /drivers/scsi/csiostor/csio_mb.h
parentscsi: aic7xxx: Convert timers to use timer_setup() (diff)
downloadkernel-qcow2-linux-fa60a31b0cf07794d643924328cd7e3a78e99aca.tar.gz
kernel-qcow2-linux-fa60a31b0cf07794d643924328cd7e3a78e99aca.tar.xz
kernel-qcow2-linux-fa60a31b0cf07794d643924328cd7e3a78e99aca.zip
scsi: csiostor: 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: "Martin K. Petersen" <martin.petersen@oracle.com> Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com> Cc: Varun Prakash <varun@chelsio.com> Cc: Johannes Thumshirn <jthumshirn@suse.de> Cc: linux-scsi@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/csiostor/csio_mb.h')
-rw-r--r--drivers/scsi/csiostor/csio_mb.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/csiostor/csio_mb.h b/drivers/scsi/csiostor/csio_mb.h
index 1bc82d0bc260..a6823df73015 100644
--- a/drivers/scsi/csiostor/csio_mb.h
+++ b/drivers/scsi/csiostor/csio_mb.h
@@ -137,6 +137,7 @@ struct csio_mbm {
uint32_t a_mbox; /* Async mbox num */
uint32_t intr_idx; /* Interrupt index */
struct timer_list timer; /* Mbox timer */
+ struct csio_hw *hw; /* Hardware pointer */
struct list_head req_q; /* Mbox request queue */
struct list_head cbfn_q; /* Mbox completion q */
struct csio_mb *mcurrent; /* Current mailbox */
@@ -252,7 +253,7 @@ void csio_mb_process_portparams_rsp(struct csio_hw *hw, struct csio_mb *mbp,
/* MB module functions */
int csio_mbm_init(struct csio_mbm *, struct csio_hw *,
- void (*)(uintptr_t));
+ void (*)(struct timer_list *));
void csio_mbm_exit(struct csio_mbm *);
void csio_mb_intr_enable(struct csio_hw *);
void csio_mb_intr_disable(struct csio_hw *);