From patchwork Fri Sep 2 21:22: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: 9311685 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 285B960772 for ; Fri, 2 Sep 2016 21:23:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17D4F2983D for ; Fri, 2 Sep 2016 21:23:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C5F329848; Fri, 2 Sep 2016 21:23:02 +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 98A0C2983D for ; Fri, 2 Sep 2016 21:23:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751765AbcIBVXB (ORCPT ); Fri, 2 Sep 2016 17:23:01 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36533 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751675AbcIBVXA (ORCPT ); Fri, 2 Sep 2016 17:23:00 -0400 Received: by mail-wm0-f66.google.com with SMTP id i138so4376154wmf.3 for ; Fri, 02 Sep 2016 14:22:59 -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=pEpc46tPQAHX8/rfZCUTKXjnCsot0k9ez1AqtBOwJu8=; b=x+nvV4v21taxgp0Zq4Kp3i7gxklTtw2NpZhpbt7y3NDPdUMkNCtUSfi+vltkIdadAr m1GjIEaG1CdsRmTDPw3c8ZKM/WhJLpzjPsC9wkPM+uYYbGG8lXVU1FKk1Oo4fEQTf8db uN+dIbt1JJoypbOWSPD+mzjwLYOOQaGOy/qOsbJbwBYWBJTpGxImU5jUV50/gd0aHsHY wAY4QtGRHsQ0ej/5m9CDRVuksBVW9Fbf+CJYrt+onxRDjlEuaYlcXo/7HB8EDHvnp2O9 QTZblWvhku4J1rcL10Sm+cWaeGr23boERFjGXBpaTka9YtYpFKWjtkDwU9O1dS13df/M VCzA== 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=pEpc46tPQAHX8/rfZCUTKXjnCsot0k9ez1AqtBOwJu8=; b=XWuRNS+I2/4vLxQAQreUB97tMPMoP0tbFTFcmjlVGz1UWNBpEPV5ir1VAaw2dITF5R rgws0oYdbV4xDbNv6QH4PczjS6TrLPBOfQepPr6QQOizfLA1y5yIlDcoa1Ku7CQ5YC50 5SiOK828EJIs73PlfsYDUJOSvynfve34eBBgM01ggrAxLDDglTspLKbQsORtXAsagQ+v jRJtIRhbXWb96NspS+j2ZCmTPutABntkZCKKm0CBiOzKKhA7cI+ry+ajKi2OEr+GYlov LY9KepGdytTpa7awdRH+rqiIcqf984/ja9DK+FMVWBomCRbqOsNMaPb6Vu4AD/QFyVmD VPTQ== X-Gm-Message-State: AE9vXwMRnW9HJdiUqBuYJr8USA7fJ7BlUZKKYuSm/wOCz2ObxhpILOmve3XmuhjAqUwaTg== X-Received: by 10.28.109.197 with SMTP id b66mr5321620wmi.68.1472851378539; Fri, 02 Sep 2016 14:22:58 -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 v189sm5361546wmv.12.2016.09.02.14.22.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Sep 2016 14:22:58 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v2 14/23] spi: fsl-espi: eliminate struct fsl_espi_transfer To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: <2872c612-a0c4-581f-4880-80bf7f8af9f9@gmail.com> Date: Fri, 2 Sep 2016 23:22: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 --- v2: - rebased --- 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 726d5fd..8554f18 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) @@ -267,17 +261,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) { @@ -288,25 +278,21 @@ 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; - - fsl_espi_setup_transfer(spi, &trans); + 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); @@ -314,23 +300,22 @@ 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 = mspi->local_buf; - espi_trans->rx_buf = mspi->local_buf; - ret = fsl_espi_do_trans(m, espi_trans); + trans->tx_buf = mspi->local_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;