[PATCH] scsi: gdth: 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. Signed-off-by: Kees CookReviewed-by: Martin K. Petersen --- This is a resend to tglx, with Reviews/Acks. Martin Petersen suggested that scsi timer conversions should go via the timer tree. --- drivers/scsi/gdth.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index a4473356a9dc..c35f05c4c6bb 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c @@ -3705,7 +3705,7 @@ static void gdth_log_event(gdth_evt_data *dvr, char *buffer) #ifdef GDTH_STATISTICS static u8 gdth_timer_running; -static void gdth_timeout(unsigned long data) +static void gdth_timeout(struct timer_list *unused) { u32 i; Scsi_Cmnd *nscp; @@ -3743,8 +3743,6 @@ static void gdth_timer_init(void) gdth_timer_running = 1; TRACE2(("gdth_detect(): Initializing timer !\n")); gdth_timer.expires = jiffies + HZ; - gdth_timer.data = 0L; - gdth_timer.function = gdth_timeout; add_timer(_timer); } #else @@ -5165,7 +5163,7 @@ static int __init gdth_init(void) /* initializations */ gdth_polling = TRUE; gdth_clear_events(); - init_timer(_timer); + timer_setup(_timer, gdth_timeout, 0); /* As default we do not probe for EISA or ISA controllers */ if (probe_eisa_isa) { -- 2.7.4 -- Kees Cook Pixel Security
[PATCH] scsi: gdth: 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. Signed-off-by: Kees Cook Reviewed-by: Martin K. Petersen --- This is a resend to tglx, with Reviews/Acks. Martin Petersen suggested that scsi timer conversions should go via the timer tree. --- drivers/scsi/gdth.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index a4473356a9dc..c35f05c4c6bb 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c @@ -3705,7 +3705,7 @@ static void gdth_log_event(gdth_evt_data *dvr, char *buffer) #ifdef GDTH_STATISTICS static u8 gdth_timer_running; -static void gdth_timeout(unsigned long data) +static void gdth_timeout(struct timer_list *unused) { u32 i; Scsi_Cmnd *nscp; @@ -3743,8 +3743,6 @@ static void gdth_timer_init(void) gdth_timer_running = 1; TRACE2(("gdth_detect(): Initializing timer !\n")); gdth_timer.expires = jiffies + HZ; - gdth_timer.data = 0L; - gdth_timer.function = gdth_timeout; add_timer(_timer); } #else @@ -5165,7 +5163,7 @@ static int __init gdth_init(void) /* initializations */ gdth_polling = TRUE; gdth_clear_events(); - init_timer(_timer); + timer_setup(_timer, gdth_timeout, 0); /* As default we do not probe for EISA or ISA controllers */ if (probe_eisa_isa) { -- 2.7.4 -- Kees Cook Pixel Security
Re: [PATCH] scsi: gdth: Convert timers to use timer_setup()
On Tue, Oct 17, 2017 at 8:06 PM, Martin K. Petersenwrote: > > Kees, > >> Thanks for the reviews! Do you want the timer tree to carry these >> patches, or can you pick them up in the scsi tree? > > Up to you. I'm not going to rebase my 4.15 queue this late in the cycle > so the patches would end up going in at the end of the merge window. If > you prefer to have them hit the first pull you should queue them up in > the timer tree. Okay, thanks, I'll take them via the timer tree. -Kees -- Kees Cook Pixel Security
Re: [PATCH] scsi: gdth: Convert timers to use timer_setup()
On Tue, Oct 17, 2017 at 8:06 PM, Martin K. Petersen wrote: > > Kees, > >> Thanks for the reviews! Do you want the timer tree to carry these >> patches, or can you pick them up in the scsi tree? > > Up to you. I'm not going to rebase my 4.15 queue this late in the cycle > so the patches would end up going in at the end of the merge window. If > you prefer to have them hit the first pull you should queue them up in > the timer tree. Okay, thanks, I'll take them via the timer tree. -Kees -- Kees Cook Pixel Security
Re: [PATCH] scsi: gdth: Convert timers to use timer_setup()
Kees, > Thanks for the reviews! Do you want the timer tree to carry these > patches, or can you pick them up in the scsi tree? Up to you. I'm not going to rebase my 4.15 queue this late in the cycle so the patches would end up going in at the end of the merge window. If you prefer to have them hit the first pull you should queue them up in the timer tree. -- Martin K. Petersen Oracle Linux Engineering
Re: [PATCH] scsi: gdth: Convert timers to use timer_setup()
Kees, > Thanks for the reviews! Do you want the timer tree to carry these > patches, or can you pick them up in the scsi tree? Up to you. I'm not going to rebase my 4.15 queue this late in the cycle so the patches would end up going in at the end of the merge window. If you prefer to have them hit the first pull you should queue them up in the timer tree. -- Martin K. Petersen Oracle Linux Engineering
Re: [PATCH] scsi: gdth: Convert timers to use timer_setup()
On Mon, Oct 16, 2017 at 9:09 PM, Martin K. Petersenwrote: > > Kees, > >> 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. > > Reviewed-by: Martin K. Petersen Thanks for the reviews! Do you want the timer tree to carry these patches, or can you pick them up in the scsi tree? -Kees -- Kees Cook Pixel Security
Re: [PATCH] scsi: gdth: Convert timers to use timer_setup()
On Mon, Oct 16, 2017 at 9:09 PM, Martin K. Petersen wrote: > > Kees, > >> 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. > > Reviewed-by: Martin K. Petersen Thanks for the reviews! Do you want the timer tree to carry these patches, or can you pick them up in the scsi tree? -Kees -- Kees Cook Pixel Security
Re: [PATCH] scsi: gdth: Convert timers to use timer_setup()
Kees, > 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. Reviewed-by: Martin K. Petersen-- Martin K. Petersen Oracle Linux Engineering
Re: [PATCH] scsi: gdth: Convert timers to use timer_setup()
Kees, > 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. Reviewed-by: Martin K. Petersen -- Martin K. Petersen Oracle Linux Engineering
[PATCH] scsi: gdth: 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: Achim LeubnerCc: "James E.J. Bottomley" Cc: "Martin K. Petersen" Cc: linux-s...@vger.kernel.org Signed-off-by: Kees Cook --- drivers/scsi/gdth.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index a4473356a9dc..c35f05c4c6bb 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c @@ -3705,7 +3705,7 @@ static void gdth_log_event(gdth_evt_data *dvr, char *buffer) #ifdef GDTH_STATISTICS static u8 gdth_timer_running; -static void gdth_timeout(unsigned long data) +static void gdth_timeout(struct timer_list *unused) { u32 i; Scsi_Cmnd *nscp; @@ -3743,8 +3743,6 @@ static void gdth_timer_init(void) gdth_timer_running = 1; TRACE2(("gdth_detect(): Initializing timer !\n")); gdth_timer.expires = jiffies + HZ; - gdth_timer.data = 0L; - gdth_timer.function = gdth_timeout; add_timer(_timer); } #else @@ -5165,7 +5163,7 @@ static int __init gdth_init(void) /* initializations */ gdth_polling = TRUE; gdth_clear_events(); - init_timer(_timer); + timer_setup(_timer, gdth_timeout, 0); /* As default we do not probe for EISA or ISA controllers */ if (probe_eisa_isa) { -- 2.7.4 -- Kees Cook Pixel Security
[PATCH] scsi: gdth: 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: Achim Leubner Cc: "James E.J. Bottomley" Cc: "Martin K. Petersen" Cc: linux-s...@vger.kernel.org Signed-off-by: Kees Cook --- drivers/scsi/gdth.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index a4473356a9dc..c35f05c4c6bb 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c @@ -3705,7 +3705,7 @@ static void gdth_log_event(gdth_evt_data *dvr, char *buffer) #ifdef GDTH_STATISTICS static u8 gdth_timer_running; -static void gdth_timeout(unsigned long data) +static void gdth_timeout(struct timer_list *unused) { u32 i; Scsi_Cmnd *nscp; @@ -3743,8 +3743,6 @@ static void gdth_timer_init(void) gdth_timer_running = 1; TRACE2(("gdth_detect(): Initializing timer !\n")); gdth_timer.expires = jiffies + HZ; - gdth_timer.data = 0L; - gdth_timer.function = gdth_timeout; add_timer(_timer); } #else @@ -5165,7 +5163,7 @@ static int __init gdth_init(void) /* initializations */ gdth_polling = TRUE; gdth_clear_events(); - init_timer(_timer); + timer_setup(_timer, gdth_timeout, 0); /* As default we do not probe for EISA or ISA controllers */ if (probe_eisa_isa) { -- 2.7.4 -- Kees Cook Pixel Security