From patchwork Thu Aug 25 04:48:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9298645 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 A2C2F60757 for ; Thu, 25 Aug 2016 04:54:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 277BC1FF10 for ; Thu, 25 Aug 2016 04:54:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 19886291BE; Thu, 25 Aug 2016 04:54:53 +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 9D9CA291C9 for ; Thu, 25 Aug 2016 04:54:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754463AbcHYEys (ORCPT ); Thu, 25 Aug 2016 00:54:48 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35820 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754440AbcHYExZ (ORCPT ); Thu, 25 Aug 2016 00:53:25 -0400 Received: by mail-wm0-f66.google.com with SMTP id i5so5640088wmg.2 for ; Wed, 24 Aug 2016 21:53:25 -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=5CNJWsd1BK/RkYi/+HVqgTttReBAPE9MgQ4jVIrZ6+g=; b=iNp3yzvEpnDdmSmOJJXeapSj+TibeMDO7IUdFAXnW0O13MVs+btaVPUxaLje69zVw5 RDtBGhwGEtqS5mynRv3z6b6PWCtiBJw8CSG/vAWrGDmsJM1uz+2/RUGfB9ammDnA1CCf hPkkFZIWo2PfuG74/Sz0kP75jlMOztdSNDOmbdsjSRV2EuDrPzPwwXYZSlWiKA+8ieWM phrrhVJTJia1K/wcoC817KpR6O/w1c5X+9ZZ5vGV/yKvOTnLVwHwBKJtp6UBMM0xNd5A h41nNmeE2GlsUltgcWV3UvTle/Nl/DLGGKCJU66v1tJ+EaA6+n8Gr7ZtZFWM+hUJELFg zGPw== 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=5CNJWsd1BK/RkYi/+HVqgTttReBAPE9MgQ4jVIrZ6+g=; b=UwHPGajqhsGfaxB1MViDRy40dC4cDNU6jB5jti9OKEiL+Ebo92vYBfhzL+i5B1QO5L nyEEUmA7trG9gL+tkJPOY1UsuS6PP+dlvfXkKN26koHxCKZOKGKagOdyF7z9WgvUJHFI De/lCSC12XfsvVYqBuGR1bkjzqxf7xirgaOHPtgeyxKu2GH4pHz/XmRTCzrOgahJR7ek segil/cNUsur8yNJCFTyqpGph2Nhaczi5EKayhtXJY2fIrOJbAbwtzlSbuIJyuSM5p17 zgtqHGkqpMXQtNlfkymMEf7NkpdA9ximqgb8w3mq3xE21YehIV4I9p0lUI+zxG/MbCQS wnaQ== X-Gm-Message-State: AEkooutORiq7TZy+fS2837uRzZ1UX9O0FG4GGOrfxfRvpmpCLoFk6F8dL2L/Qipo+ZHKqA== X-Received: by 10.28.150.10 with SMTP id y10mr5779703wmd.112.1472100804146; Wed, 24 Aug 2016 21:53:24 -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 o142sm36844270wme.20.2016.08.24.21.53.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Aug 2016 21:53:23 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 13/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: <597abb06-ec63-ace4-d400-a8040fea3c2d@gmail.com> Date: Thu, 25 Aug 2016 06:48:40 +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 --- drivers/spi/spi-fsl-espi.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 4c36a5d..6d06e14 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -301,22 +301,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 = 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 +313,9 @@ static int fsl_espi_rw_trans(struct spi_message *m, trans->tx_buf = 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 +337,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;