timer: Fix two mistakes in callback conversions

Two errors found their way into the timer callback conversions that weren't noticed with x86 allmodconfig. Reported-by: kernel test robot <[email protected]> Signed-off-by: Kees Cook <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lkml.kernel.org/r/20171005171035.GA34831@beast
berg · Oct 5, 2017 · 6ac3526 · 6ac3526
1 parent 8c20feb
commit 6ac3526
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
@@ -499,7 +499,7 @@ static void ssip_rx_wd(struct timer_list *t)
 	ssip_error(cl);
 }
 
-static void ssip_tx_wd(unsigned long data)
+static void ssip_tx_wd(struct timer_list *t)
 {
 	struct ssi_protocol *ssi = from_timer(ssi, t, tx_wd);
 	struct hsi_client *cl = ssi->cl;

diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
@@ -841,7 +841,6 @@ lcs_lancmd_timeout(struct timer_list *t)
 	unsigned long flags;
 
 	LCS_DBF_TEXT(4, trace, "timeout");
-	reply = (struct lcs_reply *) data;
 	spin_lock_irqsave(&reply->card->lock, flags);
 	list_for_each_entry_safe(list_reply, r,
 				 &reply->card->lancmd_waiters,list) {