From patchwork Thu Aug 25 04:44:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9298679 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 3FC9760B16 for ; Thu, 25 Aug 2016 04:57:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CD86291C8 for ; Thu, 25 Aug 2016 04:57:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21B04291C5; Thu, 25 Aug 2016 04:57:33 +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 AB628291C8 for ; Thu, 25 Aug 2016 04:57:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751716AbcHYEzy (ORCPT ); Thu, 25 Aug 2016 00:55:54 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33943 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751971AbcHYExN (ORCPT ); Thu, 25 Aug 2016 00:53:13 -0400 Received: by mail-wm0-f65.google.com with SMTP id q128so5638346wma.1 for ; Wed, 24 Aug 2016 21:53:13 -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=hT4wnj5y0etqo+fJhqCInhrIh8BoIqCzkbedcoxoXqM=; b=PW9tgRuwSsl7nzTTTvi1AXMda8pCJNRZOa4QTJAKXJ+j/UdIeHg1kmStIzpAu2+u02 D+p+DH5vb7pVCTGxyMcThfDUA1NS8/URzjIhg+MYP7rXNi8HDYvNhg1aknP26tcyraje V7NdOa+BqevHI9gUpGGnjPx2v4VofpvjLUsTpdhDKdABLM+dbh9ZADOjk0sSJhtmG0B6 g/rRSpdf3RolLYnDwDQRCv36040jgqjACkw25CHeHJ/46PBMY/bHlszednoNAp7UtUAa PAPMkmGkR3eK7QnVpX7vhVnkYMDwUgeN58wrFzog99XNpvRoWVvBr1dWQf5z3LdFM0Cd fGww== 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=hT4wnj5y0etqo+fJhqCInhrIh8BoIqCzkbedcoxoXqM=; b=TX1U/LOcXqvVhxbQ5BFEd6zxdqbZOe1ZZBKyo1XFsayFKxRd/BWD1m2eyPCkvkutzj XtaQjraOhT4bbc96UjK67t2CuNWgLsZytczEZsC/XiyjdPNPeKY0oXS7Oz0S7CUPnCl0 QYF0uAk6ErnP/U3K2j1STdGpCnlpuzwXSTAIrStF2omTdsptvRbhJyhNNaXI5da+r7vk U0iZGmg1xS8OXQP/qWNibs7tc/SrlzGuqL/HQTbum+EXZvLcgrdwi+IqR0dteVPtwV5v k8lKHHw3bWz1Ea8K2KbI34sMdw01b+HFZr5QON2RD/S1Pixj52J5SKn+HQKWtw0mimhA vlyw== X-Gm-Message-State: AEkoousv9o8NyPOlrS+UDtVXPUeShIhSVec+MM2wJVLWFfLyHqhMVozHIlVJ3VHcDeXNbQ== X-Received: by 10.194.106.36 with SMTP id gr4mr5422902wjb.107.1472100792013; Wed, 24 Aug 2016 21:53:12 -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 cw7sm13104279wjb.38.2016.08.24.21.53.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Aug 2016 21:53:11 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 04/23] spi: fsl-espi: change return type of fsl_espi_setup_transfer to void To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: <2800693b-704a-5530-2d58-8fd38d33dc10@gmail.com> Date: Thu, 25 Aug 2016 06:44:42 +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_setup_transfer always returns 0, so change the return type to void. Signed-off-by: Heiner Kallweit --- drivers/spi/spi-fsl-espi.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 12cb0c5..38eced3 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -128,7 +128,7 @@ static u32 fsl_espi_tx_buf_lsb(struct mpc8xxx_spi *mpc8xxx_spi) return data; } -static int fsl_espi_setup_transfer(struct spi_device *spi, +static void fsl_espi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) { struct mpc8xxx_spi *mpc8xxx_spi = spi_master_get_devdata(spi->master); @@ -193,7 +193,6 @@ static int fsl_espi_setup_transfer(struct spi_device *spi, cs->hw_mode |= CSMODE_PM(pm); fsl_espi_change_mode(spi); - return 0; } static int fsl_espi_cpu_bufs(struct mpc8xxx_spi *mspi, struct spi_transfer *t, @@ -290,13 +289,8 @@ static void fsl_espi_do_trans(struct spi_message *m, spi_message_add_tail(&trans, &message); list_for_each_entry(t, &message.transfers, transfer_list) { - if (t->bits_per_word || t->speed_hz) { - status = -EINVAL; - - status = fsl_espi_setup_transfer(spi, t); - if (status < 0) - break; - } + if (t->bits_per_word || t->speed_hz) + fsl_espi_setup_transfer(spi, t); if (t->len) status = fsl_espi_bufs(spi, t); @@ -401,7 +395,6 @@ static int fsl_espi_setup(struct spi_device *spi) { struct mpc8xxx_spi *mpc8xxx_spi; struct fsl_espi_reg *reg_base; - int retval; u32 hw_mode; u32 loop_mode; struct spi_mpc8xxx_cs *cs = spi_get_ctldata(spi); @@ -442,15 +435,11 @@ static int fsl_espi_setup(struct spi_device *spi) loop_mode |= SPMODE_LOOP; mpc8xxx_spi_write_reg(®_base->mode, loop_mode); - retval = fsl_espi_setup_transfer(spi, NULL); + fsl_espi_setup_transfer(spi, NULL); pm_runtime_mark_last_busy(mpc8xxx_spi->dev); pm_runtime_put_autosuspend(mpc8xxx_spi->dev); - if (retval < 0) { - cs->hw_mode = hw_mode; /* Restore settings */ - return retval; - } return 0; }