Skip to contentSkip to conversation

scsi: gdth: Convert timers to use timer_setup()

PATCH In review Kees Cook 2 participants 5 messages Oct 16, 2017 – Oct 18, 2017 SCSI

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc "James E.J. Bottomley" <[email protected]>
Cc "Martin K. Petersen" <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
---
 drivers/scsi/gdth.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/gdth.c +2 -4
index a4473356a9dc..c35f05c4c6bb 100644
@@ -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(&gdth_timer);
 }
 #else

@@ -5165,7 +5163,7 @@ static int __init gdth_init(void)
 	/* initializations */
 	gdth_polling = TRUE;
 	gdth_clear_events();
-	init_timer(&gdth_timer);
+	timer_setup(&gdth_timer, gdth_timeout, 0);
 
 	/* As default we do not probe for EISA or ISA controllers */
 	if (probe_eisa_isa) {
Signature · 6 lines
2.7.4


-- 
Kees Cook
Pixel Security
Reviewed-by on v1 1/1
#1 lore raw

Kees,

Quoted 3 lines

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 <[email protected]>
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
author
#2 lore raw
Quoted 8 lines · Martin K. Petersen

Kees,

Quoted 3 lines

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 <[email protected]>

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

Signature · 2 lines
Kees Cook
Pixel Security
#3 lore raw

Kees,

Quoted 2 lines

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.

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
author
#4 lore raw
Quoted 10 lines · Martin K. Petersen

Kees,

Quoted 2 lines

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

Signature · 2 lines
Kees Cook
Pixel Security