From patchwork Fri Sep 2 21:22:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9311687 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 B180960772 for ; Fri, 2 Sep 2016 21:23:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A188A2983D for ; Fri, 2 Sep 2016 21:23:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 964BD29848; Fri, 2 Sep 2016 21:23:02 +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 41A1D2983D for ; Fri, 2 Sep 2016 21:23:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751741AbcIBVXB (ORCPT ); Fri, 2 Sep 2016 17:23:01 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36539 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751699AbcIBVXB (ORCPT ); Fri, 2 Sep 2016 17:23:01 -0400 Received: by mail-wm0-f67.google.com with SMTP id i138so4376196wmf.3 for ; Fri, 02 Sep 2016 14:23:00 -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=QQBfhbLe2yP7/sBUfZAMT02dXcYDjuTnTz4n0iFkWxU=; b=lcz0h5y8d4JXZInHUtma67yL8mRsGJhirJALS5DI3Usf8G2hd5nPGC6t1P759cebvz TXzq1hKN+0hbDZEi4vnvQQEU29Cnp5z0MBIN48h6yToVVq+74JeZuTJ1NrjTmrYZOjE9 yvkSdIftDQgvZ3f54l96m8attvgMvTVCfOD3SaoWy8aihgWia0W6zas9HDSegPpxDSIN pmfiqs540pfUBh03hOxHBFDxFvcaHqXu2Q4BqeKmETl9UsfKHH1uiDdiYbAQZHwe9rzV CkGQVOsRWBDpy5La2Ipqd648yO8vyLMfBOKW1LQMSEwKfl73Hu2yIzVAfBTjeu3fDoag M3DA== 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=QQBfhbLe2yP7/sBUfZAMT02dXcYDjuTnTz4n0iFkWxU=; b=exZKqUDYq6L1f44II0FXAc3di+3EQNgB6TvvlccqfbKI+d3htHK7Ps2BPEffNg16zN AHDS7CtDADsJxNIBWPQnP+hDCB9ExRkx+zd1iM6IvRmeediN4PnIYupyz+NBtDDka/2h 2PECxpLVp0ejruL52yfVW9WL8pXeVWQw3kAJ7Je7S5uoCl+jjVYD0s9DM+Fo/M6LNidp z1N0SKzFMGPMBLwWcfpT/moxNf6+bWsorzcCZAGAR1p5NgrmuEMuQ8tb3zYbBpKuqc9h WcwXKaNscEcPcziClY7HUFahDm5kYW6mWCAEsg+52Ajw+k667i2qsksjwyJluwDccaAO 5W2Q== X-Gm-Message-State: AE9vXwMXkbOrGEVFAhRTJx2kQNAVlV4c7oUxDmDdCWa8KaeSXbELHJEQ7QWh1OEmR8+kfw== X-Received: by 10.28.6.202 with SMTP id 193mr4892208wmg.53.1472851379773; Fri, 02 Sep 2016 14:22:59 -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 h7sm12271464wjd.17.2016.09.02.14.22.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Sep 2016 14:22:59 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v2 15/23] spi: fsl-espi: merge fsl_espi_cmd_trans and fsl_espi_rw_trans To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: <5cf9843f-11c0-4a14-d7ec-66522592ece9@gmail.com> Date: Fri, 2 Sep 2016 23:22:22 +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 fsl_espi_cmd_trans and fsl_espi_rw_trans share most of the code so we can merge them. Signed-off-by: Heiner Kallweit --- v2: - rebased --- drivers/spi/spi-fsl-espi.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 8554f18..f8a6dd1 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -299,23 +299,8 @@ static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans) return ret; } -static int fsl_espi_cmd_trans(struct spi_message *m, - struct spi_transfer *trans, u8 *rx_buff) -{ - struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master); - int ret; - - fsl_espi_copy_to_buf(m, mspi); - - trans->tx_buf = mspi->local_buf; - trans->rx_buf = mspi->local_buf; - ret = fsl_espi_do_trans(m, trans); - - return ret; -} - -static int fsl_espi_rw_trans(struct spi_message *m, - struct spi_transfer *trans, u8 *rx_buff) +static int fsl_espi_trans(struct spi_message *m, struct spi_transfer *trans, + u8 *rx_buff) { struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master); unsigned int tx_only; @@ -327,12 +312,9 @@ static int fsl_espi_rw_trans(struct spi_message *m, trans->rx_buf = mspi->local_buf; ret = fsl_espi_do_trans(m, trans); - if (!ret) { - /* If there is at least one RX byte then copy it to rx_buff */ - if (trans->len > tx_only) - memcpy(rx_buff, trans->rx_buf + tx_only, - trans->len - tx_only); - } + /* If there is at least one RX byte then copy it to rx_buff */ + if (!ret && rx_buff && trans->len > tx_only) + memcpy(rx_buff, trans->rx_buf + tx_only, trans->len - tx_only); return ret; } @@ -354,10 +336,7 @@ static int fsl_espi_do_one_msg(struct spi_master *master, trans.len = xfer_len; - if (!rx_buf) - ret = fsl_espi_cmd_trans(m, &trans, NULL); - else - ret = fsl_espi_rw_trans(m, &trans, rx_buf); + ret = fsl_espi_trans(m, &trans, rx_buf); m->actual_length = ret ? 0 : trans.len;