From patchwork Fri Sep 2 21:22: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: 9311703 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 73FBA60772 for ; Fri, 2 Sep 2016 21:23:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 647BC2983D for ; Fri, 2 Sep 2016 21:23:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 598AC29848; Fri, 2 Sep 2016 21:23:13 +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 024F32983D for ; Fri, 2 Sep 2016 21:23:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752302AbcIBVXM (ORCPT ); Fri, 2 Sep 2016 17:23:12 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35499 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752269AbcIBVXL (ORCPT ); Fri, 2 Sep 2016 17:23:11 -0400 Received: by mail-wm0-f67.google.com with SMTP id c133so4383567wmd.2 for ; Fri, 02 Sep 2016 14:23:10 -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=oKUR+lVLzSm4Q7NRlCWP36uQzXf4Mcx1oOap6u0fXEY=; b=vNaxVrGvdTk/CTRK2hXI++M/BUTtaeWbWmntbA8JeoDv96k9qL4binqemGjH0dvNXe ZE+GJ/CX2Z7azezrSMA0zcHYC7rBqQYHEi8SO8/4f32SYJfXKr0lz07iYw2jy+iMPHaG N86PzE8iA8VBt7HCbFsN7T/knME68tMG+aoYCza3DVa2nEeI4Sv8E5D/Unk+ZKWu+I/b 3k7cry69b4fYQSkBRlOWDB9+neyFsHFyRSWjjl8jVEpiYDUhsjNnrFqyWtzkBm9J+eC9 CfycwF2qpjp+vj4oFbWRj4KFTfffl/eJIpSz1vQ5h8JiMw8VGeN+1gCumPZJf8D/OIzZ cZiQ== 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=oKUR+lVLzSm4Q7NRlCWP36uQzXf4Mcx1oOap6u0fXEY=; b=a3gLZB1/Q1m3CEy3KvCkfic5RuHqHYzbbdIjcHxeo0E2gfWB29oGuYwgEffuzmvwXS socBvC/zN4wwEkblklP+W68VJODDOuSW27O+hw3bILeuiWSvi0yexiKm4daEpBzZ5yER Y+feylrfpx6Tl0sEXO6ABpU+VyOrTZw1m6GRUMV+mIxFrDj21Ewdkl6vD9SBhZcAoLxP XjEfBPg/8L5GRCYE6vH6dybqRInQ1ZSoHmLDD0UgXxP+Q31CtDAHACjACzYH7lGwTco0 VokE7WtB4NMmBkeooshd53hUiIgr2tvOhjS2pvklgQ7ogcPPo4Ev+us8jLnGLO9OatIY zb1w== X-Gm-Message-State: AE9vXwOhWJG4NLRW9q/U2Pd2QCb90cIFnj2coqGgaTD08lv5IIAynKg0HVjT1hYZccl2JQ== X-Received: by 10.28.126.69 with SMTP id z66mr3580017wmc.74.1472851389858; Fri, 02 Sep 2016 14:23:09 -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 g184sm5403517wme.15.2016.09.02.14.23.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Sep 2016 14:23:09 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v2 23/23] spi: fsl-espi: merge fsl_espi_trans and fsl_espi_do_trans To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: <95cc4661-4d4c-b83d-2fe9-2d242c9ed9d4@gmail.com> Date: Fri, 2 Sep 2016 23:22: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 Merge both functions to reduce source code size and improve readability. Signed-off-by: Heiner Kallweit --- v2: - rebased --- drivers/spi/spi-fsl-espi.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 84355bb..f7d682f 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -276,11 +276,13 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t) return mpc8xxx_spi->count > 0 ? -EMSGSIZE : 0; } -static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans) +static int fsl_espi_trans(struct spi_message *m, struct spi_transfer *trans) { + struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master); struct spi_device *spi = m->spi; - int ret = 0; + int ret; + fsl_espi_copy_to_buf(m, mspi); fsl_espi_setup_transfer(spi, trans); ret = fsl_espi_bufs(spi, trans); @@ -290,18 +292,6 @@ static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans) fsl_espi_setup_transfer(spi, NULL); - return ret; -} - -static int fsl_espi_trans(struct spi_message *m, struct spi_transfer *trans) -{ - struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master); - int ret; - - fsl_espi_copy_to_buf(m, mspi); - - ret = fsl_espi_do_trans(m, trans); - if (!ret) fsl_espi_copy_from_buf(m, mspi);