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

diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
index 67af03d3aeb36e2afd489e9cf122d77db0a488b8..9b167bc6eee48ca498a070ca46cc09836f02d8c1 100644 (file)
--- 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 21bba406d5bef8dab8414470b20d208a8c1761b2..b855c6f08e96bd3e2dfa5b0eadfb720a9ad74399 100644 (file)
--- 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) {