* [PATCH] timer: Fix two mistakes in callback conversions
@ 2017-10-05 17:10 Kees Cook
2017-10-05 20:09 ` [tip:timers/core] " tip-bot for Kees Cook
0 siblings, 1 reply; 2+ messages in thread
From: Kees Cook @ 2017-10-05 17:10 UTC (permalink / raw)
To: Thomas Gleixner; +Cc: linux-kernel
Two errors found their way into the timer callback conversions that
weren't noticed with x86 allmodconfig.
Reported-by: kernel test robot <lkp@01.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
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(-)
diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
index 67af03d3aeb3..9b167bc6eee4 100644
--- 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
index 21bba406d5be..b855c6f08e96 100644
--- 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) {
--
2.7.4
--
Kees Cook
Pixel Security
^ permalink raw reply related [flat|nested] 2+ messages in thread* [tip:timers/core] timer: Fix two mistakes in callback conversions
2017-10-05 17:10 [PATCH] timer: Fix two mistakes in callback conversions Kees Cook
@ 2017-10-05 20:09 ` tip-bot for Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Kees Cook @ 2017-10-05 20:09 UTC (permalink / raw)
To: linux-tip-commits; +Cc: mingo, lkp, hpa, tglx, keescook, linux-kernel
Commit-ID: 6ac35264513e43634f127a92057f04a4b3c5cdbb
Gitweb: https://git.kernel.org/tip/6ac35264513e43634f127a92057f04a4b3c5cdbb
Author: Kees Cook <keescook@chromium.org>
AuthorDate: Thu, 5 Oct 2017 10:10:35 -0700
Committer: Thomas Gleixner <tglx@linutronix.de>
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 <lkp@01.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20171005171035.GA34831@beast
---
drivers/hsi/clients/ssi_protocol.c | 2 +-
drivers/s390/net/lcs.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
index 67af03d..9b167bc 100644
--- 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
index 21bba40..b855c6f 100644
--- 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) {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-10-05 20:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-05 17:10 [PATCH] timer: Fix two mistakes in callback conversions Kees Cook
2017-10-05 20:09 ` [tip:timers/core] " tip-bot for Kees Cook
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.