From patchwork Fri Sep 2 21:09:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9311677 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 3539560772 for ; Fri, 2 Sep 2016 21:21:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 208FA2983D for ; Fri, 2 Sep 2016 21:21:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1347929848; Fri, 2 Sep 2016 21:21:46 +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 8A3EE2983D for ; Fri, 2 Sep 2016 21:21:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751271AbcIBVVo (ORCPT ); Fri, 2 Sep 2016 17:21:44 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35848 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750989AbcIBVVn (ORCPT ); Fri, 2 Sep 2016 17:21:43 -0400 Received: by mail-wm0-f65.google.com with SMTP id i138so4373086wmf.3 for ; Fri, 02 Sep 2016 14:21:43 -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=qXketBVCLyQFjx0SQJeRTw8jsdpJilrYq8c/V+VqjL4=; b=JOwBNysAj2WbuDokhlkCVOoGUdREM+nDLeU8yY8963fdp6MgdvWuJjohFLBRr45FgP sVSdUakEJ7iewSYUMNfnPQP7tN8vEhbil9MF04ha1rccrtOG1jDPOH7y9BzNUo/LW3T0 TQFEbRCnoTeymqNJeJywVOImLOmPJDZ/eIPm1o7avQrDQq+HN2CRPNSZmFXa1nX00HA8 57E6RFWFmXLNdcO+1L3OcFbImmvMMAK1cQc9qfvFcvCpv1aZRmeFqCYSUZMet4hp1uIp MawhPsx5yTkMxElsBLjkZ0+5AI4L9Jq5as84Fjqh1AJbngCzOvpS4yFa3E58KYggIB9d 4PYQ== 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=qXketBVCLyQFjx0SQJeRTw8jsdpJilrYq8c/V+VqjL4=; b=FCwSAtL9NAbkvyfH6aRuvO8bfAAxCUZrPpNlzfz0AeEXp8WNaqWMGfLOqNIufhYcsb bA8VL/jiMMx53Ctj+w5zYRel6zvYx37Mt5vfIju8dqrMLhGdgaZnSJc70XMxc4kozkdY C/hrevfl1YTn4yJkXsomjEJyp95JPFp6aFpHLlRQPSQDC3x5nAf1RNKn6lyJVJhEUwKv CpnxFSdy/TAcYnVnhiBdLQRnX047fSJSpg9GJprtLe3NInX9HImui+OXFyhr/pRuiuyX dZ10RJ6ldzvqAOQUevPEZKI1aCb/kK1j+56yazeimooNS3IfgBYGzFNGLcwSscA4GKMV XXgw== X-Gm-Message-State: AE9vXwM/WmV8sZe0nCobaUTY/W/w14UtbeeI0S4w8L0afYONGuP06PLDEG6oJvXNXR3DXQ== X-Received: by 10.28.8.19 with SMTP id 19mr4846925wmi.81.1472851302033; Fri, 02 Sep 2016 14:21:42 -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 kk6sm9863511wjb.44.2016.09.02.14.21.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Sep 2016 14:21:41 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v2 11/23] spi: fsl-espi: remove element status from struct fsl_espi_transfer To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: Date: Fri, 2 Sep 2016 23:09:00 +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 Use the return values of the functions in the call chain to transport status information instead of using an element in struct fsl_espi_transfer for this. This is more in line with the general approach how to handle status information and is one step further to eventually get rid of struct fsl_espi_transfer completely. Signed-off-by: Heiner Kallweit --- v2: - rebased --- drivers/spi/spi-fsl-espi.c | 47 +++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 8e6ef9b..5f01b65 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -42,7 +42,6 @@ struct fsl_espi_transfer { void *rx_buf; unsigned len; unsigned actual_length; - int status; }; /* eSPI Controller mode register definitions */ @@ -269,14 +268,14 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t) return mpc8xxx_spi->count; } -static void fsl_espi_do_trans(struct spi_message *m, - struct fsl_espi_transfer *tr) +static int fsl_espi_do_trans(struct spi_message *m, + struct fsl_espi_transfer *tr) { struct spi_device *spi = m->spi; struct mpc8xxx_spi *mspi = spi_master_get_devdata(spi->master); struct fsl_espi_transfer *espi_trans = tr; struct spi_transfer *t, *first, trans; - int status = 0; + int ret = 0; memset(&trans, 0, sizeof(trans)); @@ -285,10 +284,9 @@ static void fsl_espi_do_trans(struct spi_message *m, list_for_each_entry(t, &m->transfers, transfer_list) { if ((first->bits_per_word != t->bits_per_word) || (first->speed_hz != t->speed_hz)) { - espi_trans->status = -EINVAL; dev_err(mspi->dev, "bits_per_word/speed_hz should be same for the same SPI transfer\n"); - return; + return -EINVAL; } trans.speed_hz = t->speed_hz; @@ -303,52 +301,59 @@ static void fsl_espi_do_trans(struct spi_message *m, fsl_espi_setup_transfer(spi, &trans); if (trans.len) - status = fsl_espi_bufs(spi, &trans); + ret = fsl_espi_bufs(spi, &trans); - if (status) - status = -EMSGSIZE; + if (ret) + ret = -EMSGSIZE; if (trans.delay_usecs) udelay(trans.delay_usecs); - espi_trans->status = status; fsl_espi_setup_transfer(spi, NULL); + + return ret; } -static void fsl_espi_cmd_trans(struct spi_message *m, - struct fsl_espi_transfer *trans, u8 *rx_buff) +static int fsl_espi_cmd_trans(struct spi_message *m, + struct fsl_espi_transfer *trans, u8 *rx_buff) { struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master); struct fsl_espi_transfer *espi_trans = trans; + int ret; fsl_espi_copy_to_buf(m, mspi); espi_trans->tx_buf = mspi->local_buf; espi_trans->rx_buf = mspi->local_buf; - fsl_espi_do_trans(m, espi_trans); + ret = fsl_espi_do_trans(m, espi_trans); espi_trans->actual_length = espi_trans->len; + + return ret; } -static void fsl_espi_rw_trans(struct spi_message *m, - struct fsl_espi_transfer *trans, u8 *rx_buff) +static int fsl_espi_rw_trans(struct spi_message *m, + struct fsl_espi_transfer *trans, u8 *rx_buff) { struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master); unsigned int tx_only; + int ret; tx_only = fsl_espi_copy_to_buf(m, mspi); trans->tx_buf = mspi->local_buf; trans->rx_buf = mspi->local_buf; - fsl_espi_do_trans(m, trans); + ret = fsl_espi_do_trans(m, trans); - if (!trans->status) { + 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); trans->actual_length += trans->len; } + + return ret; } static int fsl_espi_do_one_msg(struct spi_master *master, @@ -358,6 +363,7 @@ static int fsl_espi_do_one_msg(struct spi_master *master, u8 *rx_buf = NULL; unsigned int xfer_len = 0; struct fsl_espi_transfer espi_trans; + int ret; list_for_each_entry(t, &m->transfers, transfer_list) { if (t->rx_buf) @@ -368,15 +374,14 @@ static int fsl_espi_do_one_msg(struct spi_master *master, espi_trans.len = xfer_len; espi_trans.actual_length = 0; - espi_trans.status = 0; if (!rx_buf) - fsl_espi_cmd_trans(m, &espi_trans, NULL); + ret = fsl_espi_cmd_trans(m, &espi_trans, NULL); else - fsl_espi_rw_trans(m, &espi_trans, rx_buf); + ret = fsl_espi_rw_trans(m, &espi_trans, rx_buf); m->actual_length = espi_trans.actual_length; - m->status = espi_trans.status; + m->status = ret; spi_finalize_current_message(master); return 0; }