From patchwork Wed Jan 28 12:23:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 5733611 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 79878BF440 for ; Thu, 29 Jan 2015 01:36:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B454C201DD for ; Thu, 29 Jan 2015 01:36:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E273220149 for ; Thu, 29 Jan 2015 01:36:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754503AbbA2BgA (ORCPT ); Wed, 28 Jan 2015 20:36:00 -0500 Received: from mail-lb0-f169.google.com ([209.85.217.169]:37764 "EHLO mail-lb0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752993AbbA2Bf7 (ORCPT ); Wed, 28 Jan 2015 20:35:59 -0500 Received: by mail-lb0-f169.google.com with SMTP id f15so23176648lbj.0; Wed, 28 Jan 2015 17:35:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GZerqNVv7qYF5uEHNkcAKxcHjRvsBCcmfCeqtQ103K0=; b=sAhoKPJgOA/COW3njeDv5dOQbWNxjCfq/9fvP/Z7oAywA4bfthtMjtSU0YNnKWXqyl NcXeLYMncMGQTcKcQJOXxuGRnJzCy4PNX/QtyTpVKzMYV2BffWFyP4wdwMNsKnhK/QJi 9j07GxZJrQhZ8zmOUrL5TmXnObHJyl2xGG11a7v8Yxe4NvWfdCzFzGJTcVCvPVkHEVEx VAfoMZotmRQP9O7ZexFxWv1W++PpTienPshPVJJ3GdXFbxAWm9HqXF1adnY/sbeibl/2 F3B+/w2PTKE3Z60933GKCdu6dM/EQV5DJnC933hTiplBPWf+86L8HrYq4ovktc2vzMcL cg5g== X-Received: by 10.112.78.39 with SMTP id y7mr7832277lbw.42.1422447854663; Wed, 28 Jan 2015 04:24:14 -0800 (PST) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by mx.google.com with ESMTPSA id xh7sm1293741lbb.17.2015.01.28.04.24.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Jan 2015 04:24:13 -0800 (PST) From: Ricardo Ribalda Delgado To: Mark Brown , Michal Simek , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH v2 13/15] spi/xilinx: Remove remaining_words driver data variable Date: Wed, 28 Jan 2015 13:23:52 +0100 Message-Id: <1422447834-23116-14-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1422447834-23116-1-git-send-email-ricardo.ribalda@gmail.com> References: <1422447834-23116-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The variable never leaves the scope of txrx_bufs. Signed-off-by: Ricardo Ribalda Delgado --- drivers/spi/spi-xilinx.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index 8c25c59..026f4c5 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -86,7 +86,6 @@ struct xilinx_spi { u8 *rx_ptr; /* pointer in the Tx buffer */ const u8 *tx_ptr; /* pointer in the Rx buffer */ - int remaining_words; /* the number of words left to transfer */ u8 bytes_per_word; int buffer_size; /* buffer size in words */ u32 cs_inactive; /* Level of the CS pins when inactive*/ @@ -209,33 +208,27 @@ static int xilinx_spi_setup_transfer(struct spi_device *spi, return 0; } -static void xilinx_spi_fill_tx_fifo(struct xilinx_spi *xspi, int n_words) -{ - xspi->remaining_words -= n_words; - - while (n_words--) - xilinx_spi_tx(xspi); - return; -} - static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t) { struct xilinx_spi *xspi = spi_master_get_devdata(spi->master); + int remaining_words; /* the number of words left to transfer */ /* We get here with transmitter inhibited */ xspi->tx_ptr = t->tx_buf; xspi->rx_ptr = t->rx_buf; - xspi->remaining_words = t->len / xspi->bytes_per_word; + remaining_words = t->len / xspi->bytes_per_word; reinit_completion(&xspi->done); - while (xspi->remaining_words) { + while (remaining_words) { u16 cr = 0; - int n_words; + int n_words, tx_words, rx_words; - n_words = min(xspi->remaining_words, xspi->buffer_size); + n_words = min(remaining_words, xspi->buffer_size); - xilinx_spi_fill_tx_fifo(xspi, n_words); + tx_words = n_words; + while (tx_words--) + xilinx_spi_tx(xspi); /* Start the transfer by not inhibiting the transmitter any * longer @@ -261,8 +254,11 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t) xspi->regs + XSPI_CR_OFFSET); /* Read out all the data from the Rx FIFO */ - while (n_words--) + rx_words = n_words; + while (rx_words--) xilinx_spi_rx(xspi); + + remaining_words -= n_words; } return t->len;