Save a stack level and cleanup code.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@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 5d3503a..704613c 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) {
@@ -391,15 +371,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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
