From patchwork Thu Aug 25 04:46:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9298665 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 95B6560757 for ; Thu, 25 Aug 2016 04:55:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8233C291C5 for ; Thu, 25 Aug 2016 04:55:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 774E6291C8; Thu, 25 Aug 2016 04:55:57 +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 067BB291CB for ; Thu, 25 Aug 2016 04:55:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756384AbcHYEzj (ORCPT ); Thu, 25 Aug 2016 00:55:39 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36717 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753972AbcHYExU (ORCPT ); Thu, 25 Aug 2016 00:53:20 -0400 Received: by mail-wm0-f68.google.com with SMTP id i138so5623056wmf.3 for ; Wed, 24 Aug 2016 21:53:19 -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=q4V5nkmqQuMcWrHnJqY2pL7p6u/h/D2S5zDkW4hD+dM=; b=lD55xIGYe/fLz6XXr2FeDVkuGjZ4Fsrcixh/PReW7QaekLDu3poTFMNjXVdbwbWYjU 9zxaSj4ZuzWiPThqV6rtK2ih5k6sGoJU95fchA4vVOKwooKdEZq7rPRcMB7SJ5hECIuQ LjVKsVBB7XEhjsiVfEL8b9ADJLpQPlNkjT9KQn9s+rzySWiRn64fmG4F29B9v97wuQrO AKzewh3HTksZaKmBHUI2Uv+jKCeSvkOcMlpaH3EXyZnsG3rMMqnXRxJ01I996hBppga1 IPELOWT20/WV846942XqczO5VaCZYVLHClpaX2r8OsPC4ek1HTmocJCxmoptFnwby2R/ faGA== 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=q4V5nkmqQuMcWrHnJqY2pL7p6u/h/D2S5zDkW4hD+dM=; b=Xe02kFncymfWA6Gx4CXJb5KM82T3IaP+p2GGWaqkFpoRDdkj179cVYr7btXgBCTgzb 7PB92lrvyfhMUjhinzm3udEeXH+H6eMH3AcJxKUiEmrnEKPVyVd4qxvOQJrgPbMgu/tk op3+a2/fECaLbsqD5RDovF3f4DfcVBCKKx9c2Z8TWbbwdwYlkvHfb5WJywfk/6ZI0E2F FRjN2lUzKqiz+6eoCx+hJfD3tU18vOMIrgWll7tOXQ1DdfCH0LcGZ3lWYSYVpBLYAKj8 AQAmM6SZsW0xA66GWPmP24W6CN/ndV9s5w0Jpf3o0JX88O5f/sx+s8GqrLfgzzaV0/tS h9vg== X-Gm-Message-State: AEkoouuumN090JhE/NsXLRKXovmdQ4rkwGHeLzfc+mcVLq0ToE6oJOSNXrdUDPJ+EhGKaA== X-Received: by 10.194.23.166 with SMTP id n6mr5276683wjf.36.1472100798786; Wed, 24 Aug 2016 21:53:18 -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 p83sm13724759wma.18.2016.08.24.21.53.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Aug 2016 21:53:18 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 09/23] spi: fsl-espi: remove element status from struct fsl_espi_transfer To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: <90daff66-65f0-a3c7-790a-a768e3a29714@gmail.com> Date: Thu, 25 Aug 2016 06:46:58 +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 --- 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 c3aa6f0..68bf72a 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 */ @@ -270,14 +269,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)); @@ -286,10 +285,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; @@ -305,50 +303,57 @@ 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 = 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 = 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; }