From patchwork Thu Aug 25 04:48:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9298663 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 39383608A7 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 298DE291C5 for ; Thu, 25 Aug 2016 04:55:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E5CF291CA; 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 60523291C5 for ; Thu, 25 Aug 2016 04:55:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754487AbcHYEzg (ORCPT ); Thu, 25 Aug 2016 00:55:36 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33154 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754384AbcHYExY (ORCPT ); Thu, 25 Aug 2016 00:53:24 -0400 Received: by mail-wm0-f66.google.com with SMTP id o80so5646727wme.0 for ; Wed, 24 Aug 2016 21:53:23 -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=/6u1QJze39j02v9rCllCwW4G8OLGXUCJvTf6FZuotqM=; b=CGI5yT2nv3p9l1IY3beX4Rd4W+UYhVbBNLOML4eLgGI59mNqjDTn7qN3vn+A+Zpx/X duEN6oUyk6tVjg1die/ZcDqczQq6sMGrwVmcsGZ6OfFVmUod6PMOBubyxXosvEnCWjbD 9wHu0DwpSMP60yDxv1Ez9gQ6u/7QQ2va2qZq37j4OTayN+IwLZ9N1JBygvpx9Ay145nr 2NeGE3oHpQ88sv6VFC1FdZGuPwOA6vzJI5bLW4f7jtFB6mbJnmbd1ohcpqR4/Oa4PlNa wBddjX5Mcu7MjxfPtoxdv8PYbxvl0GxfOLXGJcxPvjnWjiD2a3CxFV/tqpaUBUhylBAI NyYA== 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=/6u1QJze39j02v9rCllCwW4G8OLGXUCJvTf6FZuotqM=; b=dWzK5aQZDksh5T57Mkj447elB3K95TCfaEua5WjMPRR/tZuI2H7UsJAL8IyBgU9vG3 nXP7S3zTlxEPNmz23gtxhRNEt7y0sCD1VkWGhGb73DkJwhvgfufvDDf5tiWbiaJdMP+a cxG5riLzJK0bzpVb4TxN10bGWfrzLg64bhTnv/ar4qI19VFbcBi6m4OIVqlMmqHX/wYQ +zajBs4O2LFssaMFMLV1iBJdUUhcXFahH4q/I/mDmpNzhub5xLQaOEddr2G1rl+PRCFT KeKyD0JawVQqGRfPP9xlm71hu1HZPNTGJZunw+fgLjpYkNrDHe4IcRNQq3SE/81FPq48 DFEw== X-Gm-Message-State: AEkoous7sH+AOaGbGGGq12sSwVqOLQh9o1QNDwJh3667/ulHS7kXTqwuPuR2XvpUGmoL5g== X-Received: by 10.28.228.132 with SMTP id b126mr29382761wmh.93.1472100802841; Wed, 24 Aug 2016 21:53:22 -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 c139sm36796233wme.4.2016.08.24.21.53.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Aug 2016 21:53:22 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 12/23] spi: fsl-espi: eliminate struct fsl_espi_transfer To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: <8e5d1d77-4e11-7b58-519c-7d831d2435d9@gmail.com> Date: Thu, 25 Aug 2016 06:48:20 +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 The remaining elements of struct fsl_espi_transfer are part of struct spi_transfer anyway. So we can get rid of struct fsl_espi_transfer and use a struct spi_transfer only. Signed-off-by: Heiner Kallweit --- drivers/spi/spi-fsl-espi.c | 56 +++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 4ff27bf..4c36a5d 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -37,12 +37,6 @@ struct fsl_espi_reg { __be32 csmode[4]; /* 0x020 - 0x02c eSPI cs mode register */ }; -struct fsl_espi_transfer { - const void *tx_buf; - void *rx_buf; - unsigned len; -}; - /* eSPI Controller mode register definitions */ #define SPMODE_ENABLE (1 << 31) #define SPMODE_LOOP (1 << 30) @@ -268,17 +262,13 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t) return mpc8xxx_spi->count; } -static int fsl_espi_do_trans(struct spi_message *m, - struct fsl_espi_transfer *tr) +static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans) { 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; + struct spi_transfer *t, *first; int ret = 0; - memset(&trans, 0, sizeof(trans)); - first = list_first_entry(&m->transfers, struct spi_transfer, transfer_list); list_for_each_entry(t, &m->transfers, transfer_list) { @@ -289,26 +279,22 @@ static int fsl_espi_do_trans(struct spi_message *m, return -EINVAL; } - trans.speed_hz = t->speed_hz; - trans.bits_per_word = t->bits_per_word; - trans.delay_usecs = max(first->delay_usecs, t->delay_usecs); + trans->speed_hz = t->speed_hz; + trans->bits_per_word = t->bits_per_word; + trans->delay_usecs = max(first->delay_usecs, t->delay_usecs); } - trans.len = espi_trans->len; - trans.tx_buf = espi_trans->tx_buf; - trans.rx_buf = espi_trans->rx_buf; - - if (trans.bits_per_word || trans.speed_hz) - fsl_espi_setup_transfer(spi, &trans); + if (trans->bits_per_word || trans->speed_hz) + fsl_espi_setup_transfer(spi, trans); - if (trans.len) - ret = fsl_espi_bufs(spi, &trans); + if (trans->len) + ret = fsl_espi_bufs(spi, trans); if (ret) ret = -EMSGSIZE; - if (trans.delay_usecs) - udelay(trans.delay_usecs); + if (trans->delay_usecs) + udelay(trans->delay_usecs); fsl_espi_setup_transfer(spi, NULL); @@ -316,22 +302,21 @@ static int fsl_espi_do_trans(struct spi_message *m, } static int fsl_espi_cmd_trans(struct spi_message *m, - struct fsl_espi_transfer *trans, u8 *rx_buff) + struct spi_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; - ret = fsl_espi_do_trans(m, espi_trans); + trans->tx_buf = trans->rx_buf = mspi->local_buf; + ret = fsl_espi_do_trans(m, trans); return ret; } static int fsl_espi_rw_trans(struct spi_message *m, - struct fsl_espi_transfer *trans, u8 *rx_buff) + struct spi_transfer *trans, u8 *rx_buff) { struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master); unsigned int tx_only; @@ -355,10 +340,9 @@ static int fsl_espi_rw_trans(struct spi_message *m, static int fsl_espi_do_one_msg(struct spi_master *master, struct spi_message *m) { - struct spi_transfer *t; u8 *rx_buf = NULL; unsigned int xfer_len = 0; - struct fsl_espi_transfer espi_trans; + struct spi_transfer *t, trans = {}; int ret; list_for_each_entry(t, &m->transfers, transfer_list) { @@ -368,14 +352,14 @@ static int fsl_espi_do_one_msg(struct spi_master *master, xfer_len += t->len; } - espi_trans.len = xfer_len; + trans.len = xfer_len; if (!rx_buf) - ret = fsl_espi_cmd_trans(m, &espi_trans, NULL); + ret = fsl_espi_cmd_trans(m, &trans, NULL); else - ret = fsl_espi_rw_trans(m, &espi_trans, rx_buf); + ret = fsl_espi_rw_trans(m, &trans, rx_buf); - m->actual_length = ret ? 0 : espi_trans.len; + m->actual_length = ret ? 0 : trans.len; if (m->status == -EINPROGRESS) m->status = ret; -- 2.9.2 >From 50844eb4dd9f76cf213ea3baa1ab742f09232c58 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Fri, 19 Aug 2016 20:59:01 +0200 Subject: [PATCH 12/23] remove struct fsl_espi_transfer Signed-off-by: Heiner Kallweit --- drivers/spi/spi-fsl-espi.c | 56 +++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 4ff27bf..4c36a5d 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -37,12 +37,6 @@ struct fsl_espi_reg { __be32 csmode[4]; /* 0x020 - 0x02c eSPI cs mode register */ }; -struct fsl_espi_transfer { - const void *tx_buf; - void *rx_buf; - unsigned len; -}; - /* eSPI Controller mode register definitions */ #define SPMODE_ENABLE (1 << 31) #define SPMODE_LOOP (1 << 30) @@ -268,17 +262,13 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t) return mpc8xxx_spi->count; } -static int fsl_espi_do_trans(struct spi_message *m, - struct fsl_espi_transfer *tr) +static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans) { 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; + struct spi_transfer *t, *first; int ret = 0; - memset(&trans, 0, sizeof(trans)); - first = list_first_entry(&m->transfers, struct spi_transfer, transfer_list); list_for_each_entry(t, &m->transfers, transfer_list) { @@ -289,26 +279,22 @@ static int fsl_espi_do_trans(struct spi_message *m, return -EINVAL; } - trans.speed_hz = t->speed_hz; - trans.bits_per_word = t->bits_per_word; - trans.delay_usecs = max(first->delay_usecs, t->delay_usecs); + trans->speed_hz = t->speed_hz; + trans->bits_per_word = t->bits_per_word; + trans->delay_usecs = max(first->delay_usecs, t->delay_usecs); } - trans.len = espi_trans->len; - trans.tx_buf = espi_trans->tx_buf; - trans.rx_buf = espi_trans->rx_buf; - - if (trans.bits_per_word || trans.speed_hz) - fsl_espi_setup_transfer(spi, &trans); + if (trans->bits_per_word || trans->speed_hz) + fsl_espi_setup_transfer(spi, trans); - if (trans.len) - ret = fsl_espi_bufs(spi, &trans); + if (trans->len) + ret = fsl_espi_bufs(spi, trans); if (ret) ret = -EMSGSIZE; - if (trans.delay_usecs) - udelay(trans.delay_usecs); + if (trans->delay_usecs) + udelay(trans->delay_usecs); fsl_espi_setup_transfer(spi, NULL); @@ -316,22 +302,21 @@ static int fsl_espi_do_trans(struct spi_message *m, } static int fsl_espi_cmd_trans(struct spi_message *m, - struct fsl_espi_transfer *trans, u8 *rx_buff) + struct spi_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; - ret = fsl_espi_do_trans(m, espi_trans); + trans->tx_buf = trans->rx_buf = mspi->local_buf; + ret = fsl_espi_do_trans(m, trans); return ret; } static int fsl_espi_rw_trans(struct spi_message *m, - struct fsl_espi_transfer *trans, u8 *rx_buff) + struct spi_transfer *trans, u8 *rx_buff) { struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master); unsigned int tx_only; @@ -355,10 +340,9 @@ static int fsl_espi_rw_trans(struct spi_message *m, static int fsl_espi_do_one_msg(struct spi_master *master, struct spi_message *m) { - struct spi_transfer *t; u8 *rx_buf = NULL; unsigned int xfer_len = 0; - struct fsl_espi_transfer espi_trans; + struct spi_transfer *t, trans = {}; int ret; list_for_each_entry(t, &m->transfers, transfer_list) { @@ -368,14 +352,14 @@ static int fsl_espi_do_one_msg(struct spi_master *master, xfer_len += t->len; } - espi_trans.len = xfer_len; + trans.len = xfer_len; if (!rx_buf) - ret = fsl_espi_cmd_trans(m, &espi_trans, NULL); + ret = fsl_espi_cmd_trans(m, &trans, NULL); else - ret = fsl_espi_rw_trans(m, &espi_trans, rx_buf); + ret = fsl_espi_rw_trans(m, &trans, rx_buf); - m->actual_length = ret ? 0 : espi_trans.len; + m->actual_length = ret ? 0 : trans.len; if (m->status == -EINPROGRESS) m->status = ret;