From patchwork Wed Sep 20 23:27:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9962981 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D9ED160208 for ; Wed, 20 Sep 2017 23:38:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC14A29262 for ; Wed, 20 Sep 2017 23:38:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0B602926A; Wed, 20 Sep 2017 23:38:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3958129262 for ; Wed, 20 Sep 2017 23:38:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752353AbdITXis (ORCPT ); Wed, 20 Sep 2017 19:38:48 -0400 Received: from mail-pf0-f174.google.com ([209.85.192.174]:57292 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752170AbdITXiF (ORCPT ); Wed, 20 Sep 2017 19:38:05 -0400 Received: by mail-pf0-f174.google.com with SMTP id g65so2296210pfe.13 for ; Wed, 20 Sep 2017 16:38:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eqCXBcoiOqDYi3WbPLrlGpBPCwFWnVcX/Hf6AfMs7bQ=; b=masUOD9Pp3eKPiM7sAyRpnNnJYc46bHht+c+1KQG+HjidojQGSjH7hI1vrfGK2BuMs L7JxtJEM5PBy41AP1UdJi7RyhNLrB+fAbvIAUxDuR+/96NPfcUky3inDyB4BKu3J5w1U Hi9bJWiivJTgihYREVsuIDqcvEtLUNhdlbqeI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eqCXBcoiOqDYi3WbPLrlGpBPCwFWnVcX/Hf6AfMs7bQ=; b=o8l3LX6oPOOdRoFOXuxmSEoMAmNh6Vvoba/Ar51YfdQgRV25EO0+98Ma+nhnlIIU2B C7/sx4bE/dkQklHd9fHI+/2Ei9liW9r0m5r5YDH4ZcwM7+PlmTcbMJewD5BLrKvlwhUF BVDrSDyCfUFmx4HCNjjROvgxMdYSLh982Bmer9FlqK2JUCXVJqV/gdvrAuZEgdB7R73r Ja3qXED/Esn4JlX/vKEdkVBRtzZzqAHthcxv1W8520IHuGNpajrok+4uHosdGN9c/bzD DLrJ3Oj+uiCN6KDoCEyof14Oop3JL0wrVEZGstZwYefRLtp26mpuTvbc2Bf8ranN1Wdz Xnug== X-Gm-Message-State: AHPjjUiRSme2gB1RLLqRjiRHBuYtvxWiET+nw//qv05onfDTNogKGvss IWWu2iFfgxU4qamPOB8Uhli1Ug== X-Google-Smtp-Source: AOwi7QBLwy2PXqh3hmQ8Oh16FT8JnwJJ5IkpbU9QoYiWSW33BAxTyFRuvWqcEskp+DhhIgMQMuJqgg== X-Received: by 10.101.69.74 with SMTP id x10mr3790705pgr.294.1505950684970; Wed, 20 Sep 2017 16:38:04 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id b66sm52064pfe.165.2017.09.20.16.37.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 16:38:03 -0700 (PDT) From: Kees Cook To: Thomas Gleixner Cc: Kees Cook , Samuel Ortiz , Tyrel Datwyler , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , "James E.J. Bottomley" , "Martin K. Petersen" , netdev@vger.kernel.org, linux-scsi@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 19/31] timer: Remove open-coded casts for .data and .function Date: Wed, 20 Sep 2017 16:27:43 -0700 Message-Id: <1505950075-50223-20-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505950075-50223-1-git-send-email-keescook@chromium.org> References: <1505950075-50223-1-git-send-email-keescook@chromium.org> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This standardizes the callback and data prototypes in several places that perform casting, in an effort to remove more open-coded .data and .function uses in favor of setup_timer(). Cc: Samuel Ortiz Cc: Tyrel Datwyler Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: "James E.J. Bottomley" Cc: "Martin K. Petersen" Cc: netdev@vger.kernel.org Cc: linux-scsi@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Kees Cook Acked-by: Tyrel Datwyler # for ibmvscsi --- drivers/scsi/ibmvscsi/ibmvfc.c | 14 ++++++-------- drivers/scsi/ibmvscsi/ibmvscsi.c | 8 ++++---- drivers/staging/irda/drivers/bfin_sir.c | 5 +++-- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index b491af31a5f8..66d51052caa1 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c @@ -1393,8 +1393,9 @@ static int ibmvfc_map_sg_data(struct scsi_cmnd *scmd, * * Called when an internally generated command times out **/ -static void ibmvfc_timeout(struct ibmvfc_event *evt) +static void ibmvfc_timeout(unsigned long data) { + struct ibmvfc_event *evt = (struct ibmvfc_event *)data; struct ibmvfc_host *vhost = evt->vhost; dev_err(vhost->dev, "Command timed out (%p). Resetting connection\n", evt); ibmvfc_reset_host(vhost); @@ -1424,12 +1425,10 @@ static int ibmvfc_send_event(struct ibmvfc_event *evt, BUG(); list_add_tail(&evt->queue, &vhost->sent); - init_timer(&evt->timer); + setup_timer(&evt->timer, ibmvfc_timeout, (unsigned long)evt); if (timeout) { - evt->timer.data = (unsigned long) evt; evt->timer.expires = jiffies + (timeout * HZ); - evt->timer.function = (void (*)(unsigned long))ibmvfc_timeout; add_timer(&evt->timer); } @@ -3692,8 +3691,9 @@ static void ibmvfc_tgt_adisc_cancel_done(struct ibmvfc_event *evt) * out, reset the CRQ. When the ADISC comes back as cancelled, * log back into the target. **/ -static void ibmvfc_adisc_timeout(struct ibmvfc_target *tgt) +static void ibmvfc_adisc_timeout(unsigned long data) { + struct ibmvfc_target *tgt = (struct ibmvfc_target *)data; struct ibmvfc_host *vhost = tgt->vhost; struct ibmvfc_event *evt; struct ibmvfc_tmf *tmf; @@ -3778,9 +3778,7 @@ static void ibmvfc_tgt_adisc(struct ibmvfc_target *tgt) if (timer_pending(&tgt->timer)) mod_timer(&tgt->timer, jiffies + (IBMVFC_ADISC_TIMEOUT * HZ)); else { - tgt->timer.data = (unsigned long) tgt; tgt->timer.expires = jiffies + (IBMVFC_ADISC_TIMEOUT * HZ); - tgt->timer.function = (void (*)(unsigned long))ibmvfc_adisc_timeout; add_timer(&tgt->timer); } @@ -3912,7 +3910,7 @@ static int ibmvfc_alloc_target(struct ibmvfc_host *vhost, u64 scsi_id) tgt->vhost = vhost; tgt->need_login = 1; tgt->cancel_key = vhost->task_set++; - init_timer(&tgt->timer); + setup_timer(&tgt->timer, ibmvfc_adisc_timeout, (unsigned long)tgt); kref_init(&tgt->kref); ibmvfc_init_tgt(tgt, ibmvfc_tgt_implicit_logout); spin_lock_irqsave(vhost->host->host_lock, flags); diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index 7d156b161482..ffe917f02695 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c @@ -837,8 +837,9 @@ static void ibmvscsi_reset_host(struct ibmvscsi_host_data *hostdata) * * Called when an internally generated command times out */ -static void ibmvscsi_timeout(struct srp_event_struct *evt_struct) +static void ibmvscsi_timeout(unsigned long data) { + struct srp_event_struct *evt_struct = (struct srp_event_struct *)data; struct ibmvscsi_host_data *hostdata = evt_struct->hostdata; dev_err(hostdata->dev, "Command timed out (%x). Resetting connection\n", @@ -927,11 +928,10 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct, */ list_add_tail(&evt_struct->list, &hostdata->sent); - init_timer(&evt_struct->timer); + setup_timer(&evt_struct->timer, ibmvscsi_timeout, + (unsigned long)evt_struct); if (timeout) { - evt_struct->timer.data = (unsigned long) evt_struct; evt_struct->timer.expires = jiffies + (timeout * HZ); - evt_struct->timer.function = (void (*)(unsigned long))ibmvscsi_timeout; add_timer(&evt_struct->timer); } diff --git a/drivers/staging/irda/drivers/bfin_sir.c b/drivers/staging/irda/drivers/bfin_sir.c index 3151b580dbd6..c9413bd580a7 100644 --- a/drivers/staging/irda/drivers/bfin_sir.c +++ b/drivers/staging/irda/drivers/bfin_sir.c @@ -317,8 +317,9 @@ static void bfin_sir_dma_rx_chars(struct net_device *dev) async_unwrap_char(dev, &self->stats, &self->rx_buff, port->rx_dma_buf.buf[i]); } -void bfin_sir_rx_dma_timeout(struct net_device *dev) +void bfin_sir_rx_dma_timeout(unsigned long data) { + struct net_device *dev = (struct net_device *)data; struct bfin_sir_self *self = netdev_priv(dev); struct bfin_sir_port *port = self->sir_port; int x_pos, pos; @@ -406,7 +407,7 @@ static int bfin_sir_startup(struct bfin_sir_port *port, struct net_device *dev) enable_dma(port->rx_dma_channel); port->rx_dma_timer.data = (unsigned long)(dev); - port->rx_dma_timer.function = (void *)bfin_sir_rx_dma_timeout; + port->rx_dma_timer.function = bfin_sir_rx_dma_timeout; #else