diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-23 01:30:04 +0300 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-11-01 21:27:08 +0300 |
| commit | c251a7be46b0ee64d02b321081e24ea51fae2cfe (patch) | |
| tree | 4e740714f59d9e2de54fe08bd874d73504dcc3b3 /drivers/scsi/megaraid/megaraid_ioctl.h | |
| parent | f22eb4d31c21ac2be001fa7bcd079e2d7d02a8f1 (diff) | |
| download | linux-c251a7be46b0ee64d02b321081e24ea51fae2cfe.tar.xz | |
scsi: megaraid: 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. Also consolidates the timer setup
functions arguments, which are all identical, and corrects on-stack timer
usage.
Cc: Kashyap Desai <kashyap.desai@broadcom.com>
Cc: Sumit Saxena <sumit.saxena@broadcom.com>
Cc: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: megaraidlinux.pdl@broadcom.com
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/megaraid/megaraid_ioctl.h')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_ioctl.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/megaraid/megaraid_ioctl.h b/drivers/scsi/megaraid/megaraid_ioctl.h index 05f6e4ec3453..eedcbde46459 100644 --- a/drivers/scsi/megaraid/megaraid_ioctl.h +++ b/drivers/scsi/megaraid/megaraid_ioctl.h @@ -19,6 +19,7 @@ #include <linux/types.h> #include <linux/semaphore.h> +#include <linux/timer.h> #include "mbox_defs.h" @@ -153,6 +154,11 @@ typedef struct uioc { } __attribute__ ((aligned(1024),packed)) uioc_t; +/* For on-stack uioc timers. */ +struct uioc_timeout { + struct timer_list timer; + uioc_t *uioc; +}; /** * struct mraid_hba_info - information about the controller |