From patchwork Wed Sep 7 20:54: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: 9319925 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 9BDDC60CF6 for ; Wed, 7 Sep 2016 20:56:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87D1529427 for ; Wed, 7 Sep 2016 20:56:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 76E842942A; Wed, 7 Sep 2016 20:56:17 +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=-4.4 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 1C7262942C for ; Wed, 7 Sep 2016 20:56:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757333AbcIGU4L (ORCPT ); Wed, 7 Sep 2016 16:56:11 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36452 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757273AbcIGUzw (ORCPT ); Wed, 7 Sep 2016 16:55:52 -0400 Received: by mail-wm0-f65.google.com with SMTP id l65so4841033wmf.3 for ; Wed, 07 Sep 2016 13:55:52 -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=PjcqGhoj0RLCLIuoh3efnh0PX2Ei4nR4mt0IpeRyzvQ=; b=H8cVBeSO4E6w2U6lDK84RqRRYP4B5ffZT9gnrTL+sub/p5K5wr7sFqvPC5XSfMCjpU M4BpxELmbU28SFp5rd7BLxFNYbB9Em2LFuulGz3iQcqQeztwp4GSz5sc2zaadsSN1kuV ID4RafZARRCh4xReegKRoV48ctF5C6KCSU4Do6iXjio/XCh2h2iTeFuy+uE64NjvCNNZ dfUogw0H7oxGwOQy0S8lC9E3N/rV/ZvHVfFsCpmVDZHzMRWVvZAbWTUoRuzETqTDMvoQ zC1nFxIC8iGSm1BvaX38rElJToU05E5bhCQSAirZVvM/giFqdvx5GlK130xOhLBWxJBj bD3Q== 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=PjcqGhoj0RLCLIuoh3efnh0PX2Ei4nR4mt0IpeRyzvQ=; b=ZLkMUKHDRYESmMDHgZtcg0jsZGcJ1MUHSWO8vmM2q+rt7rHeuehOt8UDJv/wswSkw5 gCCfxytL+AkvMlgxqml89lKlB7CJ0krfZez8cz8+jyE9EO71C3SU4KhJxA9dZ43/ewbe u3O31WmwrA1b8k0bsNbbb6yrZ66fWczJkOqNVoeKZuDS9sdNH0LOSz28OE0jQKjL93Bu SgR8p70o9mGUA7KsdzswwwZkrVA9nMKKY7Ejwbl9GHO1H5IKBwn6VPhwcvYhEhDt3Wzv UMH6RFhHoYPYtYoKOJAXjidK/cciJfKSNbMA7zjHXyS11JCVzZov05NpMWwrj+F6umBP Urmw== X-Gm-Message-State: AE9vXwOg9lFpb9vZ0lrMXzOHyr7uD9Y3d+lKlOkwoqPb5i74m8Tgc8eZtzNLVfQOKG1Brg== X-Received: by 10.194.58.178 with SMTP id s18mr4120370wjq.0.1473281751423; Wed, 07 Sep 2016 13:55:51 -0700 (PDT) Received: from ?IPv6:2003:62:5f43:9500:6565:4488:ad4:60db? (p200300625F439500656544880AD460DB.dip0.t-ipconnect.de. [2003:62:5f43:9500:6565:4488:ad4:60db]) by smtp.googlemail.com with ESMTPSA id bk7sm37220941wjc.36.2016.09.07.13.55.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Sep 2016 13:55:51 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v3 12/15] spi: fsl-espi: centralize populating struct spi_transfer To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: Date: Wed, 7 Sep 2016 22:54: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 Better structure the code by population all elements of struct spi_transfer in one place. Signed-off-by: Heiner Kallweit --- v2: - rebased v3: - new numbering --- drivers/spi/spi-fsl-espi.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index a32bc3a..79c89bf 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -272,17 +272,8 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t) static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans) { struct spi_device *spi = m->spi; - struct spi_transfer *t, *first; int ret = 0; - first = list_first_entry(&m->transfers, struct spi_transfer, - transfer_list); - list_for_each_entry(t, &m->transfers, transfer_list) { - trans->speed_hz = t->speed_hz; - trans->bits_per_word = t->bits_per_word; - trans->delay_usecs = max(first->delay_usecs, t->delay_usecs); - } - fsl_espi_setup_transfer(spi, trans); if (trans->len) @@ -305,8 +296,6 @@ static int fsl_espi_trans(struct spi_message *m, struct spi_transfer *trans, tx_only = fsl_espi_copy_to_buf(m, mspi); - trans->tx_buf = mspi->local_buf; - trans->rx_buf = mspi->local_buf; ret = fsl_espi_do_trans(m, trans); /* If there is at least one RX byte then copy it to rx_buff */ @@ -319,8 +308,9 @@ static int fsl_espi_trans(struct spi_message *m, struct spi_transfer *trans, static int fsl_espi_do_one_msg(struct spi_master *master, struct spi_message *m) { + struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master); u8 *rx_buf = NULL; - unsigned int xfer_len = 0; + unsigned int delay_usecs = 0, xfer_len = 0; struct spi_transfer *t, trans = {}; int ret; @@ -333,9 +323,19 @@ static int fsl_espi_do_one_msg(struct spi_master *master, rx_buf = t->rx_buf; if ((t->tx_buf) || (t->rx_buf)) xfer_len += t->len; + if (t->delay_usecs > delay_usecs) + delay_usecs = t->delay_usecs; } + t = list_first_entry(&m->transfers, struct spi_transfer, + transfer_list); + trans.len = xfer_len; + trans.speed_hz = t->speed_hz; + trans.bits_per_word = t->bits_per_word; + trans.delay_usecs = delay_usecs; + trans.tx_buf = mspi->local_buf; + trans.rx_buf = mspi->local_buf; ret = fsl_espi_trans(m, &trans, rx_buf);