From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752160AbdJEUNA (ORCPT ); Thu, 5 Oct 2017 16:13:00 -0400 Received: from terminus.zytor.com ([65.50.211.136]:37849 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751415AbdJEUM7 (ORCPT ); Thu, 5 Oct 2017 16:12:59 -0400 Date: Thu, 5 Oct 2017 13:09:47 -0700 From: tip-bot for Kees Cook Message-ID: Cc: mingo@kernel.org, lkp@01.org, hpa@zytor.com, tglx@linutronix.de, keescook@chromium.org, linux-kernel@vger.kernel.org Reply-To: lkp@01.org, mingo@kernel.org, linux-kernel@vger.kernel.org, keescook@chromium.org, hpa@zytor.com, tglx@linutronix.de In-Reply-To: <20171005171035.GA34831@beast> References: <20171005171035.GA34831@beast> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timer: Fix two mistakes in callback conversions Git-Commit-ID: 6ac35264513e43634f127a92057f04a4b3c5cdbb X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 6ac35264513e43634f127a92057f04a4b3c5cdbb Gitweb: https://git.kernel.org/tip/6ac35264513e43634f127a92057f04a4b3c5cdbb Author: Kees Cook AuthorDate: Thu, 5 Oct 2017 10:10:35 -0700 Committer: Thomas Gleixner 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 Signed-off-by: Kees Cook Signed-off-by: Thomas Gleixner 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) {