From patchwork Thu Aug 25 04:47:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9298661 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 0DB4560757 for ; Thu, 25 Aug 2016 04:55:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF5BF291C7 for ; Thu, 25 Aug 2016 04:55:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E45E7291CA; Thu, 25 Aug 2016 04:55:56 +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 9639D291C9 for ; Thu, 25 Aug 2016 04:55:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756344AbcHYEzh (ORCPT ); Thu, 25 Aug 2016 00:55:37 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34009 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754192AbcHYExX (ORCPT ); Thu, 25 Aug 2016 00:53:23 -0400 Received: by mail-wm0-f66.google.com with SMTP id q128so5638721wma.1 for ; Wed, 24 Aug 2016 21:53:22 -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=fIa1eMOyNOpSKI4Rwt1t90+bgvtdG3PCe5u2/heczZo=; b=t0EP8/ZGnXdzId2AtKjkOOK9OjMJeqlmhGOlO7f7NxdYPzRQndKhnB+lai8kJ4Nq74 atyruRJf7mmfIFGW2Ot7F3UUybtHLEkhqbpYGBhTUtuEVvZR3otnKw0Q25DNFMe2zRze /mVICZh1th0a2VOpALr7e99VZfpQAxTr7Lwu6wHQH61zKe/tpW5hx3N4vPy/z3fIfrrK O/VIseF7t/6YTJx64/6K/snwJJDz3+wekboSdcRHYJnU+TIUz/J35Q3aNpXDvKxU6OvA BclrpSns9nr/9mj4PI9wynM8CZMTPqrK7Pj+X8Z3L/wlpSgu9UoBehNMwKR2wSPLoTvI gBWQ== 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=fIa1eMOyNOpSKI4Rwt1t90+bgvtdG3PCe5u2/heczZo=; b=L+xH1pso3SWjm+eiENDxu2+hEkhyDysFlEHnp4XVSqGHKGrWmDRVIkvakLBiuUD2+m bkU3qHyHUKN55cDDh7fnZf66swYqXHbsdNoZSDqo8qwiSVg3mc7X6wdbQEeFR2Q3vBrt LngNhfpCj1Hl3cAt17KImLKhFWMF9SugBTxqoM8A4+yLUBofhaiY6g2ef6Z4+AFy5HPJ ZOQSNYA4EhFSOfrcr/wnKHw7XsUr30xVPjS6GPFTw1wwAZ1qQ16cH0G/VffAOtkpj7ba DvSK3vgGegkpsCEGGcArJVG45rlDb1cZdSMEF2K/nIMKNv66F+TmIYIeT3pvsDD6XDdz GCww== X-Gm-Message-State: AEkooutwQ9ER6aQMihJFTmRfHXtxI1w+Nzf0oQyGGk2EZEPlHp+ybh04tKNEa//r830CQQ== X-Received: by 10.194.47.100 with SMTP id c4mr5474308wjn.34.1472100801443; Wed, 24 Aug 2016 21:53:21 -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 pm1sm13077075wjb.40.2016.08.24.21.53.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Aug 2016 21:53:21 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 11/23] spi: fsl-espi: remove element actual_length from struct fsl_espi_trans To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: <5aedfb17-f7c7-bab1-68c8-17136945bfd3@gmail.com> Date: Thu, 25 Aug 2016 06:47:58 +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 If an error occurs during processing the message, then we don't have to populate the actual_length element of struct message. So we can get rid of element actual_length in struct fsl_espi_transfer. Signed-off-by: Heiner Kallweit --- drivers/spi/spi-fsl-espi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index c15d2bc..4ff27bf 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -41,7 +41,6 @@ struct fsl_espi_transfer { const void *tx_buf; void *rx_buf; unsigned len; - unsigned actual_length; }; /* eSPI Controller mode register definitions */ @@ -328,8 +327,6 @@ static int fsl_espi_cmd_trans(struct spi_message *m, espi_trans->tx_buf = espi_trans->rx_buf = mspi->local_buf; ret = fsl_espi_do_trans(m, espi_trans); - espi_trans->actual_length = espi_trans->len; - return ret; } @@ -350,7 +347,6 @@ static int fsl_espi_rw_trans(struct spi_message *m, if (trans->len > tx_only) memcpy(rx_buff, trans->rx_buf + tx_only, trans->len - tx_only); - trans->actual_length += trans->len; } return ret; @@ -373,14 +369,14 @@ static int fsl_espi_do_one_msg(struct spi_master *master, } espi_trans.len = xfer_len; - espi_trans.actual_length = 0; if (!rx_buf) ret = fsl_espi_cmd_trans(m, &espi_trans, NULL); else ret = fsl_espi_rw_trans(m, &espi_trans, rx_buf); - m->actual_length = espi_trans.actual_length; + m->actual_length = ret ? 0 : espi_trans.len; + if (m->status == -EINPROGRESS) m->status = ret;