From patchwork Mon Sep 12 19:08:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 9327695 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 923186048B for ; Mon, 12 Sep 2016 19:08:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D4CD28E90 for ; Mon, 12 Sep 2016 19:08:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7263E28E93; Mon, 12 Sep 2016 19:08:51 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 1505628E97 for ; Mon, 12 Sep 2016 19:08:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754151AbcILTIo (ORCPT ); Mon, 12 Sep 2016 15:08:44 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:33178 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932395AbcILTIl (ORCPT ); Mon, 12 Sep 2016 15:08:41 -0400 Received: from debutante.sirena.org.uk ([2a01:348:6:8808:fab::3] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1bjWaq-0003CO-R7; Mon, 12 Sep 2016 19:08:39 +0000 Received: from broonie by debutante with local (Exim 4.87) (envelope-from ) id 1bjWao-0002ry-2d; Mon, 12 Sep 2016 20:08:34 +0100 From: Mark Brown To: Heiner Kallweit Cc: Mark Brown , Mark Brown , "linux-spi@vger.kernel.org" In-Reply-To: <5cf9843f-11c0-4a14-d7ec-66522592ece9@gmail.com> Message-Id: Date: Mon, 12 Sep 2016 20:08:34 +0100 X-SA-Exim-Connect-IP: 2a01:348:6:8808:fab::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: Applied "spi: fsl-espi: merge fsl_espi_cmd_trans and fsl_espi_rw_trans" to the spi tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure 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 The patch spi: fsl-espi: merge fsl_espi_cmd_trans and fsl_espi_rw_trans has been applied to the spi tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 809b1e017bbdaf40d35619e41c1dbc542a5449d2 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Wed, 7 Sep 2016 22:52:25 +0200 Subject: [PATCH] spi: fsl-espi: merge fsl_espi_cmd_trans and fsl_espi_rw_trans fsl_espi_cmd_trans and fsl_espi_rw_trans share most of the code so we can merge them. Signed-off-by: Heiner Kallweit Signed-off-by: Mark Brown --- 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 8554f18e4cf6..f8a6dd13ee02 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;