From patchwork Thu Aug 25 04:52:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9298653 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 A5311608A7 for ; Thu, 25 Aug 2016 04:55:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95A6A291C0 for ; Thu, 25 Aug 2016 04:55:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AD5D291C5; Thu, 25 Aug 2016 04:55:34 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 36E30291C1 for ; Thu, 25 Aug 2016 04:55:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755257AbcHYEym (ORCPT ); Thu, 25 Aug 2016 00:54:42 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34114 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754736AbcHYExh (ORCPT ); Thu, 25 Aug 2016 00:53:37 -0400 Received: by mail-wm0-f68.google.com with SMTP id q128so5639279wma.1 for ; Wed, 24 Aug 2016 21:53:37 -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=NiYNnVGJ9r68Noe1x25+iZH3yjZq2i5aGWeGCNXHUbA=; b=ELSmCXjwuotfwFrUovShWRBR3rH8oEk3F6m5xPYyxB4/Dfni9i6HUIm3GoqujBa3as xGxe+94dhaRtnHG7fCzsqRXiJpzRZRrIW3OqV1NKPOqQ3hCaa5hiCmCJTYV1z8EEybcA FpnRmclg4Osct5Owz8PX0EWZ+YVokbbJp2tMMyCub0I+UtXsxc3QXtDQzRQOLbOHZjJW SG8jNVrGuK8NtIjLPm25qXhFogkzD9HbH4zJ3ndhZp3bDYQdtpUrDFueFO9pjohFFWYX OdBpBxlvQK7h1L3wEOxjdDqHIsUI63XGrlohTdUGbQd+/+bKwBUWU2UAPUhXpiS4LoK8 XXIg== 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=NiYNnVGJ9r68Noe1x25+iZH3yjZq2i5aGWeGCNXHUbA=; b=Y0S2k27yWLqOBv4S7fXtdGazieFqo7iqRU4ZgaUvRpU+D9ZMMDtvMaLM7PtNpEF8AR bBkyhyb7s0Bw1SMKEikmULBTI+SNUA+XY8+esyS8d3KN+GGwBAaATwmBV41Z+vorE8ZL UklmKwfeWlLK9I2i1F343fNO7QCwHLkT1twuYZHAmpYX/NbRNXWpS7y19eq+o9lLh/Zu IKZy9ldGkQ/5v16PVlGr64T2FKEpu2av6Wg1n5s0REd4jdXgxWmTPfQTQe6sEUNFV4l7 uaNFz+ffLCPH2x8PJ+SjtB7rlD1gLgoknVBUWcsY0tbqoBPnyd41WAjpiZElfsb++GwE kuZw== X-Gm-Message-State: AEkoouuqAc+3HhLHU1Y+8WdLROQYdG1dl+bkTXrnK8o2PWHDQFa/tMeC3/4mUZYPvv2IQw== X-Received: by 10.194.5.230 with SMTP id v6mr6230909wjv.92.1472100816221; Wed, 24 Aug 2016 21:53:36 -0700 (PDT) Received: from ?IPv6:2003:62:5f43:9500:dd82:2805:e44f:720e? (p200300625F439500DD822805E44F720E.dip0.t-ipconnect.de. [2003:62:5f43:9500:dd82:2805:e44f:720e]) by smtp.googlemail.com with ESMTPSA id kq2sm13083878wjc.41.2016.08.24.21.53.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Aug 2016 21:53:35 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 22/23] spi: fsl-espi: improve message length handling To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: <1fa1d34d-e384-7134-d41f-2bfd96b69d2a@gmail.com> Date: Thu, 25 Aug 2016 06:52:00 +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 --- 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 a5a67ce..51b0213 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,13 +328,14 @@ 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 = 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: