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 v2 11/15] spi/xilinx: Convert bits_per_word in bytes_per_word
Date: Wed, 28 Jan 2015 13:23:50 +0100 [thread overview]
Message-ID: <1422447834-23116-12-git-send-email-ricardo.ribalda@gmail.com> (raw)
In-Reply-To: <1422447834-23116-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 | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index 8ed306e..b16fccf 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -87,7 +87,7 @@ 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 bits_per_word;
+ u8 bytes_per_word;
int buffer_size; /* buffer size in words */
u32 cs_inactive; /* Level of the CS pins when inactive*/
unsigned int (*read_fn)(void __iomem *);
@@ -121,7 +121,7 @@ static void xilinx_spi_tx(struct xilinx_spi *xspi)
return;
}
xspi->write_fn(*(u32 *)(xspi->tx_ptr), xspi->regs + XSPI_TXD_OFFSET);
- xspi->tx_ptr += xspi->bits_per_word / 8;
+ xspi->tx_ptr += xspi->bytes_per_word;
}
static void xilinx_spi_rx(struct xilinx_spi *xspi)
@@ -131,19 +131,19 @@ static void xilinx_spi_rx(struct xilinx_spi *xspi)
if (!xspi->rx_ptr)
return;
- switch (xspi->bits_per_word) {
- case 8:
+ switch (xspi->bytes_per_word) {
+ case 1:
*(u8 *)(xspi->rx_ptr) = data;
break;
- case 16:
+ case 2:
*(u16 *)(xspi->rx_ptr) = data;
break;
- case 32:
+ case 4:
*(u32 *)(xspi->rx_ptr) = data;
break;
}
- xspi->rx_ptr += xspi->bits_per_word / 8;
+ xspi->rx_ptr += xspi->bytes_per_word;
}
static void xspi_init_hw(struct xilinx_spi *xspi)
@@ -246,7 +246,7 @@ 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_words = (t->len * 8) / xspi->bits_per_word;
+ xspi->remaining_words = t->len / xspi->bytes_per_word;
reinit_completion(&xspi->done);
while (xspi->remaining_words) {
@@ -410,7 +410,7 @@ static int xilinx_spi_probe(struct platform_device *pdev)
}
master->bits_per_word_mask = SPI_BPW_MASK(bits_per_word);
- xspi->bits_per_word = bits_per_word;
+ xspi->bytes_per_word = bits_per_word / 8;
xspi->buffer_size = xilinx_spi_find_buffer_size(xspi);
xspi->irq = platform_get_irq(pdev, 0);
--
2.1.4
next prev parent reply other threads:[~2015-01-29 1:37 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-28 12:23 [PATCH v2 00/15] spi/xilinx: Speed-up Ricardo Ribalda Delgado
2015-01-28 12:23 ` [PATCH v2 01/15] spi/xilinx: Simplify spi_fill_tx_fifo Ricardo Ribalda Delgado
2015-01-28 12:23 ` [PATCH v2 02/15] spi/xilinx: Leave the IRQ always enabled Ricardo Ribalda Delgado
2015-01-28 19:38 ` Mark Brown
2015-01-28 12:23 ` [PATCH v2 03/15] spi/xilinx: Code cleanup Ricardo Ribalda Delgado
2015-01-28 12:23 ` [PATCH v2 04/15] spi/xilinx: Use cached value of register Ricardo Ribalda Delgado
2015-01-28 12:23 ` [PATCH v2 05/15] spi/xilinx: Support cores with no interrupt Ricardo Ribalda Delgado
2015-01-28 12:23 ` [PATCH v2 06/15] spi/xilinx: Do not inhibit transmission in polling mode Ricardo Ribalda Delgado
2015-01-28 12:23 ` [PATCH v2 07/15] spi/xilinx: Support for spi mode CS_HIGH Ricardo Ribalda Delgado
2015-01-28 12:23 ` [PATCH v2 08/15] spi/xilinx: Remove rx_fn and tx_fn pointer Ricardo Ribalda Delgado
2015-01-28 12:23 ` [PATCH v2 09/15] spi/xilinx: Make spi_tx and spi_rx simmetric Ricardo Ribalda Delgado
2015-01-28 12:23 ` [PATCH v2 10/15] spi/xilinx: Convert remainding_bytes in remaining words Ricardo Ribalda Delgado
2015-01-28 12:23 ` Ricardo Ribalda Delgado [this message]
2015-01-28 12:23 ` [PATCH v2 12/15] spi/xilinx: Remove iowrite/ioread wrappers Ricardo Ribalda Delgado
2015-01-30 6:13 ` Ricardo Ribalda Delgado
2015-01-28 12:23 ` [PATCH v2 13/15] spi/xilinx: Remove remaining_words driver data variable Ricardo Ribalda Delgado
2015-01-28 12:23 ` [PATCH v2 14/15] spi/xilinx: Check number of slaves range Ricardo Ribalda Delgado
2015-01-28 19:40 ` Mark Brown
2015-01-28 12:23 ` [PATCH v2 15/15] spi/xilinx: Use polling mode on small transfers Ricardo Ribalda Delgado
2015-01-28 19:43 ` [PATCH v2 00/15] spi/xilinx: Speed-up 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=1422447834-23116-12-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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®