Skip to contentSkip to conversation

timer: Fix two mistakes in callback conversions

PATCH New Kees Cook 2 participants 2 messages Oct 5, 2017

Subsystems (4)
Network drivers s390 s390 network drivers HSI
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 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]>

---
This should apply cleanly on top of tip/timers/core

---
 drivers/hsi/clients/ssi_protocol.c | 2 +-
 drivers/s390/net/lcs.c             | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/hsi/clients/ssi_protocol.c +1 -1
index 67af03d3aeb3..9b167bc6eee4 100644
@@ -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;
drivers/s390/net/lcs.c +0 -1
index 21bba406d5be..b855c6f08e96 100644
@@ -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) {
Signature · 6 lines
2.7.4


-- 
Kees Cook
Pixel Security
merge bot
#1 lore raw
timer: Fix two mistakes in callback conversions
Commit-ID:  6ac35264513e43634f127a92057f04a4b3c5cdbb
Gitweb:     https://git.kernel.org/tip/6ac35264513e43634f127a92057f04a4b3c5cdbb
Author:     Kees Cook <[email protected]>
AuthorDate: Thu, 5 Oct 2017 10:10:35 -0700
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Thu, 5 Oct 2017 22:04:48 +0200

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 open here
---
 drivers/hsi/clients/ssi_protocol.c | 2 +-
 drivers/s390/net/lcs.c             | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/hsi/clients/ssi_protocol.c +1 -1
index 67af03d..9b167bc 100644
@@ -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;
drivers/s390/net/lcs.c +0 -1
index 21bba40..b855c6f 100644
@@ -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) {