From patchwork Wed Sep 7 20:52:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9319909 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 E04C8607D3 for ; Wed, 7 Sep 2016 20:55:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEB5829425 for ; Wed, 7 Sep 2016 20:55:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3C1829428; Wed, 7 Sep 2016 20:55:49 +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=-4.4 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 5AB4A29425 for ; Wed, 7 Sep 2016 20:55:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756660AbcIGUzs (ORCPT ); Wed, 7 Sep 2016 16:55:48 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36373 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756775AbcIGUzp (ORCPT ); Wed, 7 Sep 2016 16:55:45 -0400 Received: by mail-wm0-f68.google.com with SMTP id l65so4840616wmf.3 for ; Wed, 07 Sep 2016 13:55:44 -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=6YwRlDV2PpAf+wBAG0ZQwbSJ3hdVH+JCEZL5Jk0FWJ0=; b=maCGpodKf58fz2R25dZdoXpU9o7PeU5tk/3Ztdr54sDDtZdH18hlNdq/0jeMzeczK/ NKvvN/NnLq5fXAHVxSOYQ2GWpKp04h2i4ic81pZbLRhB5WVdWntXWNXzStFR2bstKMNC D4m1uJ4bem2NztGEkbipssBePQ2ZcqAb3YduhqRmmNZP21QH4WP71KQRgD+IVhLwZ4E9 pe7zRdyFKaKZBMcj8Z1q798RUpErAsXcq17hKpu7VADrTX90m7pwEJ782lfSzK4RBVzf reh6TGCOCQEQe//N2RjQ8prEhSZsUtilRJe4MTAKtqTdHSgTm5D9a2vakctZSaE4sr2C ALjQ== 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=6YwRlDV2PpAf+wBAG0ZQwbSJ3hdVH+JCEZL5Jk0FWJ0=; b=FH6v2KdpdTAPX+q/W2Qg3/0KS2g2q35jgvCfW8rI0YEtwE5vdkoH0I+ubsGZhj2yBI n0XZJlgE/fceXs2D4P5ap7M+2ptmt6R2Yu2MzxH8ilUPwOn52cIMc/yRJJLPOZhCgTsK shx+IOaGaKWKaiyuHZUw9afFl38Vksj36EWt+biw+SKZg9DRUgkf/hb+uYZtR25trTg/ V77uObntSefbgHNmggiBpDi7c6Ec54H7NtQKpKxZONtIPn4TVIPugRQaRc9MTDPv2GUB abPQgkEkgOteKwNFaQgEFiDLsq82CZQXa0maCRs3zt0qcOa15aik1tM19GG74jNjC/1i CjLA== X-Gm-Message-State: AE9vXwM++XCLrmeDfPAR54pMU5/Q2d9n6VwRNmFeEZylYrCO7g/KJWHZlnQ0CZMghdNNPQ== X-Received: by 10.28.195.10 with SMTP id t10mr5390197wmf.9.1473281743750; Wed, 07 Sep 2016 13:55:43 -0700 (PDT) Received: from ?IPv6:2003:62:5f43:9500:6565:4488:ad4:60db? (p200300625F439500656544880AD460DB.dip0.t-ipconnect.de. [2003:62:5f43:9500:6565:4488:ad4:60db]) by smtp.googlemail.com with ESMTPSA id v2sm6032591wmf.3.2016.09.07.13.55.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Sep 2016 13:55:43 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v3 07/15] 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: <9fbe79e2-6793-b03a-7b12-a178917c0e2d@gmail.com> Date: Wed, 7 Sep 2016 22:52:25 +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 v3: - new numbering --- 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;