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 12/15] spi/xilinx: Remove iowrite/ioread wrappers
Date: Wed, 28 Jan 2015 13:23:51 +0100 [thread overview]
Message-ID: <1422447834-23116-13-git-send-email-ricardo.ribalda@gmail.com> (raw)
In-Reply-To: <1422447834-23116-1-git-send-email-ricardo.ribalda@gmail.com>
Save a stack level and cleanup code.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
drivers/spi/spi-xilinx.c | 28 ++++------------------------
1 file changed, 4 insertions(+), 24 deletions(-)
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index b16fccf..8c25c59 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -94,26 +94,6 @@ struct xilinx_spi {
void (*write_fn)(u32, void __iomem *);
};
-static void xspi_write32(u32 val, void __iomem *addr)
-{
- iowrite32(val, addr);
-}
-
-static unsigned int xspi_read32(void __iomem *addr)
-{
- return ioread32(addr);
-}
-
-static void xspi_write32_be(u32 val, void __iomem *addr)
-{
- iowrite32be(val, addr);
-}
-
-static unsigned int xspi_read32_be(void __iomem *addr)
-{
- return ioread32be(addr);
-}
-
static void xilinx_spi_tx(struct xilinx_spi *xspi)
{
if (!xspi->tx_ptr) {
@@ -398,15 +378,15 @@ static int xilinx_spi_probe(struct platform_device *pdev)
* Setup little endian helper functions first and try to use them
* and check if bit was correctly setup or not.
*/
- xspi->read_fn = xspi_read32;
- xspi->write_fn = xspi_write32;
+ xspi->read_fn = ioread32;
+ xspi->write_fn = iowrite32;
xspi->write_fn(XSPI_CR_LOOP, xspi->regs + XSPI_CR_OFFSET);
tmp = xspi->read_fn(xspi->regs + XSPI_CR_OFFSET);
tmp &= XSPI_CR_LOOP;
if (tmp != XSPI_CR_LOOP) {
- xspi->read_fn = xspi_read32_be;
- xspi->write_fn = xspi_write32_be;
+ xspi->read_fn = ioread32be;
+ xspi->write_fn = iowrite32be;
}
master->bits_per_word_mask = SPI_BPW_MASK(bits_per_word);
--
2.1.4
next prev parent reply other threads:[~2015-01-29 1:40 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 ` [PATCH v2 11/15] spi/xilinx: Convert bits_per_word in bytes_per_word Ricardo Ribalda Delgado
2015-01-28 12:23 ` Ricardo Ribalda Delgado [this message]
2015-01-30 6:13 ` [PATCH v2 12/15] spi/xilinx: Remove iowrite/ioread wrappers 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-13-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®