From patchwork Wed Sep 7 20:54:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9319919 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 38AA860869 for ; Wed, 7 Sep 2016 20:56:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27EEE29429 for ; Wed, 7 Sep 2016 20:56:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CA7A2942D; Wed, 7 Sep 2016 20:56:17 +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 A40DD29429 for ; Wed, 7 Sep 2016 20:56:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757406AbcIGU4B (ORCPT ); Wed, 7 Sep 2016 16:56:01 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33647 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757365AbcIGUz5 (ORCPT ); Wed, 7 Sep 2016 16:55:57 -0400 Received: by mail-wm0-f65.google.com with SMTP id b187so852979wme.0 for ; Wed, 07 Sep 2016 13:55:56 -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=JBsjaNx00tpEQbGIL2UksK70OVSehRAmBla0r4SfEtg=; b=fE8YTQB2ID2oJ4x3bSLpsviyHOvJnfTM8YBkflSjYxYBuzvGANzdUlNt+tTEjB5AVD Z6fbXC7NNUdYrVS0+Jt7hrucmb2w2iaz4BKQNMJvQsgw0eWeskMq5B/Uk2IEUtCtLsD7 tOW1+7oA6XIglIi3xf2/1YhJ15Hy77AiNT+L+FgOTfn+laPgeQ9Ao8ACzuqxhuMsDzeb kvKyzsJzqY0k0wGxbtIZKOV80u4JGtw5bo3tYblZhJ1PsIzocrRqbmYPauoq57BuLE0v 10nP+gI1bowGIuQOEXb48lYXf6j4x4b/TZiG45TyOmxhWzoFHR2VkkTZ1De/ZbZXqppf qF1g== 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=JBsjaNx00tpEQbGIL2UksK70OVSehRAmBla0r4SfEtg=; b=AtmYUGcPU3am0VDnGsB1vY6Gzayza79CS0wvJpmz0I8ayWZyE1UUhRwzVV+tTHdD24 DkhmwBhBV9DDLfpN2Q2rJn6t/DGocJNNKbSRb8m/dhSoRFBmK/415mJn2G8VyvioCGeY iEFYbVS7fXFE7f7EgvAESTM215ng5Kw8ArDAXCQNmBjX8iYPLMmbOlXMGJrRsMiUrd4Y ZORgF/88uvweJ70+zgfNJTdki+fsw3UDmNUBmIyzOU0H2UCvTgAlNB10YuEsVK4HJYUB OH1k2yS8GO9YKSdknpmKwCc784GSpymkYJNEF3frYWw0dOguwcm8wvFbtzivzqvMV/Qi uy6w== X-Gm-Message-State: AE9vXwOrpF+OrO+9XioZcreLq7fLNRBwzV1kWWnPbuYdV53ybLHrzBoLyvSzriNfiy2J0w== X-Received: by 10.194.122.137 with SMTP id ls9mr31762897wjb.29.1473281755553; Wed, 07 Sep 2016 13:55:55 -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 f4sm6096462wmf.8.2016.09.07.13.55.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Sep 2016 13:55:55 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v3 15/15] spi: fsl-espi: merge fsl_espi_trans and fsl_espi_do_trans To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: Date: Wed, 7 Sep 2016 22:54:51 +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 v3: - new numbering --- 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);