From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> To: "Mark Brown" <broonie@kernel.org>, "Michal Simek" <michal.simek@xilinx.com>, "Sören Brinkmann" <soren.brinkmann@xilinx.com>, linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Subject: [PATCH 13/18] spi/xilinx: Convert remainding_bytes in remaining words Date: Fri, 23 Jan 2015 17:08:45 +0100 [thread overview] Message-ID: <1422029330-10971-14-git-send-email-ricardo.ribalda@gmail.com> (raw) In-Reply-To: <1422029330-10971-1-git-send-email-ricardo.ribalda@gmail.com> Simplify the code by using the unit used on most of the code logic. Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> --- drivers/spi/spi-xilinx.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index 514ad01..fce5d0b 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -86,7 +86,7 @@ struct xilinx_spi { u8 *rx_ptr; /* pointer in the Tx buffer */ const u8 *tx_ptr; /* pointer in the Rx buffer */ - int remaining_bytes; /* the number of bytes left to transfer */ + int remaining_words; /* the number of words left to transfer */ u8 bits_per_word; int buffer_size; /* buffer size in words */ u32 cs_inactive; /* Level of the CS pins when inactive*/ @@ -231,7 +231,7 @@ static int xilinx_spi_setup_transfer(struct spi_device *spi, static void xilinx_spi_fill_tx_fifo(struct xilinx_spi *xspi, int n_words) { - xspi->remaining_bytes -= n_words * xspi->bits_per_word / 8; + xspi->remaining_words -= n_words; while (n_words--) xilinx_spi_tx(xspi); @@ -246,15 +246,14 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t) xspi->tx_ptr = t->tx_buf; xspi->rx_ptr = t->rx_buf; - xspi->remaining_bytes = t->len; + xspi->remaining_words = (t->len * 8) / xspi->bits_per_word; reinit_completion(&xspi->done); - while (xspi->remaining_bytes) { + while (xspi->remaining_words) { u16 cr = 0; int n_words; - n_words = (xspi->remaining_bytes * 8) / xspi->bits_per_word; - n_words = min(n_words, xspi->buffer_size); + n_words = min(xspi->remaining_words, xspi->buffer_size); xilinx_spi_fill_tx_fifo(xspi, n_words); @@ -286,7 +285,7 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t) xilinx_spi_rx(xspi); } - return t->len - xspi->remaining_bytes; + return t->len; } -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: ricardo.ribalda@gmail.com (Ricardo Ribalda Delgado) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 13/18] spi/xilinx: Convert remainding_bytes in remaining words Date: Fri, 23 Jan 2015 17:08:45 +0100 [thread overview] Message-ID: <1422029330-10971-14-git-send-email-ricardo.ribalda@gmail.com> (raw) In-Reply-To: <1422029330-10971-1-git-send-email-ricardo.ribalda@gmail.com> Simplify the code by using the unit used on most of the code logic. Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> --- drivers/spi/spi-xilinx.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index 514ad01..fce5d0b 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -86,7 +86,7 @@ struct xilinx_spi { u8 *rx_ptr; /* pointer in the Tx buffer */ const u8 *tx_ptr; /* pointer in the Rx buffer */ - int remaining_bytes; /* the number of bytes left to transfer */ + int remaining_words; /* the number of words left to transfer */ u8 bits_per_word; int buffer_size; /* buffer size in words */ u32 cs_inactive; /* Level of the CS pins when inactive*/ @@ -231,7 +231,7 @@ static int xilinx_spi_setup_transfer(struct spi_device *spi, static void xilinx_spi_fill_tx_fifo(struct xilinx_spi *xspi, int n_words) { - xspi->remaining_bytes -= n_words * xspi->bits_per_word / 8; + xspi->remaining_words -= n_words; while (n_words--) xilinx_spi_tx(xspi); @@ -246,15 +246,14 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t) xspi->tx_ptr = t->tx_buf; xspi->rx_ptr = t->rx_buf; - xspi->remaining_bytes = t->len; + xspi->remaining_words = (t->len * 8) / xspi->bits_per_word; reinit_completion(&xspi->done); - while (xspi->remaining_bytes) { + while (xspi->remaining_words) { u16 cr = 0; int n_words; - n_words = (xspi->remaining_bytes * 8) / xspi->bits_per_word; - n_words = min(n_words, xspi->buffer_size); + n_words = min(xspi->remaining_words, xspi->buffer_size); xilinx_spi_fill_tx_fifo(xspi, n_words); @@ -286,7 +285,7 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t) xilinx_spi_rx(xspi); } - return t->len - xspi->remaining_bytes; + return t->len; } -- 2.1.4
next prev parent reply other threads:[~2015-01-23 16:11 UTC|newest] Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-23 16:08 [PATCH 00/18] spi/xilinx: Speed-up Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` [PATCH 01/18] spi/xilinx: Support for spi mode LSB_FIRST Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-26 19:23 ` Mark Brown 2015-01-26 19:23 ` Mark Brown 2015-01-26 19:23 ` Mark Brown 2015-01-23 16:08 ` [PATCH 02/18] spi/xilinx: Support for spi mode LOOP Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-26 19:23 ` Mark Brown 2015-01-26 19:23 ` Mark Brown 2015-01-26 19:23 ` Mark Brown 2015-01-23 16:08 ` [PATCH 03/18] spi/xilinx: Simplify data read from the Rx FIFO Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-27 17:25 ` Mark Brown 2015-01-27 17:25 ` Mark Brown 2015-01-27 17:25 ` Mark Brown 2015-01-23 16:08 ` [PATCH 04/18] spi-xilinx: Simplify spi_fill_tx_fifo Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-26 23:54 ` Mark Brown 2015-01-26 23:54 ` Mark Brown 2015-01-23 16:08 ` [PATCH 05/18] spi/xilinx: Leave the IRQ always enabled Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` [PATCH 06/18] spi/xilinx: Code cleanup Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-27 0:05 ` Mark Brown 2015-01-27 0:05 ` Mark Brown 2015-01-27 0:05 ` Mark Brown 2015-01-23 16:08 ` [PATCH 07/18] spi/xilinx: Use cached value of register Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` [PATCH 08/18] spi/xilinx: Support cores with no interrupt Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-27 0:04 ` Mark Brown 2015-01-27 0:04 ` Mark Brown 2015-01-27 0:04 ` Mark Brown 2015-01-27 19:05 ` Ricardo Ribalda Delgado 2015-01-27 19:05 ` Ricardo Ribalda Delgado 2015-01-27 19:49 ` Mark Brown 2015-01-27 19:49 ` Mark Brown 2015-01-27 19:49 ` Mark Brown 2015-01-27 19:56 ` Ricardo Ribalda Delgado 2015-01-27 19:56 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` [PATCH 09/18] spi/xilinx: Do not inhibit transmission in polling mode Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` [PATCH 10/18] spi/xilinx: Support for spi mode CS_HIGH Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` [PATCH 11/18] spi/xilinx: Remove rx_fn and tx_fn pointer Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-27 0:09 ` Mark Brown 2015-01-27 0:09 ` Mark Brown 2015-01-27 0:09 ` Mark Brown 2015-01-27 10:00 ` Ricardo Ribalda Delgado 2015-01-27 10:00 ` Ricardo Ribalda Delgado 2015-01-27 10:00 ` Ricardo Ribalda Delgado 2015-01-27 15:42 ` Joe Perches 2015-01-27 15:42 ` Joe Perches 2015-01-27 15:42 ` Joe Perches 2015-01-27 19:07 ` Ricardo Ribalda Delgado 2015-01-27 19:07 ` Ricardo Ribalda Delgado 2015-01-27 19:07 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` [PATCH 12/18] spi/xilinx: Make spi_tx and spi_rx simmetric Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado [this message] 2015-01-23 16:08 ` [PATCH 13/18] spi/xilinx: Convert remainding_bytes in remaining words Ricardo Ribalda Delgado 2015-01-23 16:08 ` [PATCH 14/18] spi/xilinx: Convert bits_per_word in bytes_per_word Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` [PATCH 15/18] spi/xilinx: Remove iowrite/ioread wrappers Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` [PATCH 16/18] spi/xilinx: Reset core before buffer_size detection Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-27 0:11 ` Mark Brown 2015-01-27 0:11 ` Mark Brown 2015-01-27 0:11 ` Mark Brown 2015-01-23 16:08 ` [PATCH 17/18] spi/xilinx: Remove remaining_words driver data variable Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-23 16:08 ` [PATCH 18/18] spi/xilinx: Check number of slaves range Ricardo Ribalda Delgado 2015-01-23 16:08 ` Ricardo Ribalda Delgado 2015-01-27 0:14 ` [PATCH 00/18] spi/xilinx: Speed-up Mark Brown 2015-01-27 0:14 ` Mark Brown 2015-01-27 0:14 ` Mark Brown 2015-01-27 10:17 ` Ricardo Ribalda Delgado 2015-01-27 10:17 ` Ricardo Ribalda Delgado 2015-01-27 11:59 ` Mark Brown 2015-01-27 11:59 ` Mark Brown 2015-01-27 11:59 ` Mark Brown
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1422029330-10971-14-git-send-email-ricardo.ribalda@gmail.com \ --to=ricardo.ribalda@gmail.com \ --cc=broonie@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=michal.simek@xilinx.com \ --cc=soren.brinkmann@xilinx.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.