From patchwork Fri Sep 2 21:22:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9311701 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 7439F60772 for ; Fri, 2 Sep 2016 21:23:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 648022983D for ; Fri, 2 Sep 2016 21:23:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5951B29848; Fri, 2 Sep 2016 21:23:12 +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=-5.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham 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 06A512983D for ; Fri, 2 Sep 2016 21:23:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752249AbcIBVXL (ORCPT ); Fri, 2 Sep 2016 17:23:11 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:32811 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752090AbcIBVXK (ORCPT ); Fri, 2 Sep 2016 17:23:10 -0400 Received: by mail-wm0-f68.google.com with SMTP id w207so4386970wmw.0 for ; Fri, 02 Sep 2016 14:23:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=Nv7fR64k9ArY0hSZbztvOhBEUuV4/I2eyxkh1cZLYnw=; b=j1nfrctWoWA/vewSkZakoNiLmFbxXjNura2Tb6NrZzrkXPIl1VfbMrqY04pX3zyJjp uUxwoi+Mlot5kkdr3HkTMC/Isd0Fccbxnj28V4XDwFsXVbn0QI6gs8BktGplx9srvBv8 byB1LksoIVl9Q31E1G0jJJgsTQcglYawDflcTRVED/otK4+gciAIyXPAeUqxhuc5mCtv 4i/6QUlQICsbjV2LwvHmUPtrPr/l6OEVhNNrjbLkxc2/tXqpkkWp7NcOGqhTb4Njo4F7 EL52TfFgWxUYsypOESwXfgAj4gqA0ikPnQWuaZum4sOYzevv5egVItfKRzcT6y6c9aAp UwpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=Nv7fR64k9ArY0hSZbztvOhBEUuV4/I2eyxkh1cZLYnw=; b=cFrb9JyGq+1tVsFVrACmaArfsdcU5/w9SKT41Wtj9w87I+U4KRatBJ826F9zpmp1fq EOKg30FRNfwiM7oJNDIWJm+IYx7/rFNn2mBIHeKrARelWW5sovhaFJ0fROODmCi3quIF /n9l2MbkgFcw9SB7A2e3BmO631sAbEiEk8FBPAqcCnONBpq8h/EenLSkpU2n6dEdLA8i C28tt48FbYb/cvfEQVL1VJojzBdGvzu9oG7lWla4YHJLirckp4VD3H7VRmZp73CAW95Y OO6ROgRQhre4n6qGQWe+cUO1doOYWiTZ89rMnYo6tINyRM20s0IcLk2lfBfYChQ7pgfz 3MGQ== X-Gm-Message-State: AE9vXwOB99DjvYvNveg+3+LVwQrX7BH1fO2uT3B4r8iIMmbGr7IzSXnXVWuvxHA3/aOdSw== X-Received: by 10.28.29.215 with SMTP id d206mr4835560wmd.75.1472851388671; Fri, 02 Sep 2016 14:23:08 -0700 (PDT) Received: from ?IPv6:2003:62:5f43:9500:39ed:a1fb:9a43:e02d? (p200300625F43950039EDA1FB9A43E02D.dip0.t-ipconnect.de. [2003:62:5f43:9500:39ed:a1fb:9a43:e02d]) by smtp.googlemail.com with ESMTPSA id q4sm12280935wjk.24.2016.09.02.14.23.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Sep 2016 14:23:08 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v2 22/23] spi: fsl-espi: improve message length handling To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: Date: Fri, 2 Sep 2016 23:22:38 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move checking for a zero-length message up in the call chain and use m->frame_length instead of re-calculating the overall length of all transfers in the message. Signed-off-by: Heiner Kallweit --- v2: - rebased --- drivers/spi/spi-fsl-espi.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 88935a3..84355bb 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -283,8 +283,7 @@ static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans) fsl_espi_setup_transfer(spi, trans); - if (trans->len) - ret = fsl_espi_bufs(spi, trans); + ret = fsl_espi_bufs(spi, trans); if (trans->delay_usecs) udelay(trans->delay_usecs); @@ -313,7 +312,7 @@ static int fsl_espi_do_one_msg(struct spi_master *master, struct spi_message *m) { struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master); - unsigned int delay_usecs = 0, xfer_len = 0; + unsigned int delay_usecs = 0; struct spi_transfer *t, trans = {}; int ret; @@ -322,8 +321,6 @@ static int fsl_espi_do_one_msg(struct spi_master *master, goto out; list_for_each_entry(t, &m->transfers, transfer_list) { - if ((t->tx_buf) || (t->rx_buf)) - xfer_len += t->len; if (t->delay_usecs > delay_usecs) delay_usecs = t->delay_usecs; } @@ -331,14 +328,15 @@ static int fsl_espi_do_one_msg(struct spi_master *master, t = list_first_entry(&m->transfers, struct spi_transfer, transfer_list); - trans.len = xfer_len; + trans.len = m->frame_length; trans.speed_hz = t->speed_hz; trans.bits_per_word = t->bits_per_word; trans.delay_usecs = delay_usecs; trans.tx_buf = mspi->local_buf; trans.rx_buf = mspi->local_buf; - ret = fsl_espi_trans(m, &trans); + if (trans.len) + ret = fsl_espi_trans(m, &trans); m->actual_length = ret ? 0 : trans.len; out: