nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

spi/xilinx: Remove rx_fn and tx_fn pointer

Browse source 
Simplify the code by removing the tx and and rx function pointers and
substitute them by a single function.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ricardo Ribalda Delgado 2015-01-28 13:23:47 +01:00 committed by Mark Brown
parent f9c6ef6cfe
commit 24ba5e593f
1 changed files with 18 additions and 51 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

69
drivers/spi/spi-xilinx.c
View file

@ -92,8 +92,6 @@ struct xilinx_spi {
u32 cs_inactive; /* Level of the CS pins when inactive*/ u32 cs_inactive; /* Level of the CS pins when inactive*/
unsigned int (*read_fn)(void __iomem *); unsigned int (*read_fn)(void __iomem *);
void (*write_fn)(u32, void __iomem *); void (*write_fn)(u32, void __iomem *);
void (*tx_fn)(struct xilinx_spi *);
void (*rx_fn)(struct xilinx_spi *);
}; };
static void xspi_write32(u32 val, void __iomem *addr) static void xspi_write32(u32 val, void __iomem *addr)
@ -116,49 +114,32 @@ static unsigned int xspi_read32_be(void __iomem *addr)
return ioread32be(addr); return ioread32be(addr);
} }
static void xspi_tx8(struct xilinx_spi *xspi) static void xilinx_spi_tx(struct xilinx_spi *xspi)
{
xspi->write_fn(*xspi->tx_ptr, xspi->regs + XSPI_TXD_OFFSET);
xspi->tx_ptr++;
}
static void xspi_tx16(struct xilinx_spi *xspi)
{
xspi->write_fn(*(u16 *)(xspi->tx_ptr), xspi->regs + XSPI_TXD_OFFSET);
xspi->tx_ptr += 2;
}
static void xspi_tx32(struct xilinx_spi *xspi)
{ {
xspi->write_fn(*(u32 *)(xspi->tx_ptr), xspi->regs + XSPI_TXD_OFFSET); xspi->write_fn(*(u32 *)(xspi->tx_ptr), xspi->regs + XSPI_TXD_OFFSET);
xspi->tx_ptr += 4; xspi->tx_ptr += xspi->bits_per_word / 8;
} }
static void xspi_rx8(struct xilinx_spi *xspi) static void xilinx_spi_rx(struct xilinx_spi *xspi)
{ {
u32 data = xspi->read_fn(xspi->regs + XSPI_RXD_OFFSET); u32 data = xspi->read_fn(xspi->regs + XSPI_RXD_OFFSET);
if (xspi->rx_ptr) {
*xspi->rx_ptr = data & 0xff;
xspi->rx_ptr++;
}
}
static void xspi_rx16(struct xilinx_spi *xspi) if (!xspi->rx_ptr)
{ return;
u32 data = xspi->read_fn(xspi->regs + XSPI_RXD_OFFSET);
if (xspi->rx_ptr) {
*(u16 *)(xspi->rx_ptr) = data & 0xffff;
xspi->rx_ptr += 2;
}
}
static void xspi_rx32(struct xilinx_spi *xspi) switch (xspi->bits_per_word) {
{ case 8:
u32 data = xspi->read_fn(xspi->regs + XSPI_RXD_OFFSET); *(u8 *)(xspi->rx_ptr) = data;
if (xspi->rx_ptr) { break;
case 16:
*(u16 *)(xspi->rx_ptr) = data;
break;
case 32:
*(u32 *)(xspi->rx_ptr) = data; *(u32 *)(xspi->rx_ptr) = data;
xspi->rx_ptr += 4; break;
} }
xspi->rx_ptr += xspi->bits_per_word / 8;
} }
static void xspi_init_hw(struct xilinx_spi *xspi) static void xspi_init_hw(struct xilinx_spi *xspi)
@ -250,7 +231,7 @@ static void xilinx_spi_fill_tx_fifo(struct xilinx_spi *xspi, int n_words)
while (n_words--) while (n_words--)
if (xspi->tx_ptr) if (xspi->tx_ptr)
xspi->tx_fn(xspi); xilinx_spi_tx(xspi);
else else
xspi->write_fn(0, xspi->regs + XSPI_TXD_OFFSET); xspi->write_fn(0, xspi->regs + XSPI_TXD_OFFSET);
return; return;
@ -301,7 +282,7 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
/* Read out all the data from the Rx FIFO */ /* Read out all the data from the Rx FIFO */
while (n_words--) while (n_words--)
xspi->rx_fn(xspi); xilinx_spi_rx(xspi);
} }
return t->len - xspi->remaining_bytes; return t->len - xspi->remaining_bytes;
@ -430,20 +411,6 @@ static int xilinx_spi_probe(struct platform_device *pdev)
master->bits_per_word_mask = SPI_BPW_MASK(bits_per_word); master->bits_per_word_mask = SPI_BPW_MASK(bits_per_word);
xspi->bits_per_word = bits_per_word; xspi->bits_per_word = bits_per_word;
if (xspi->bits_per_word == 8) {
xspi->tx_fn = xspi_tx8;
xspi->rx_fn = xspi_rx8;
} else if (xspi->bits_per_word == 16) {
xspi->tx_fn = xspi_tx16;
xspi->rx_fn = xspi_rx16;
} else if (xspi->bits_per_word == 32) {
xspi->tx_fn = xspi_tx32;
xspi->rx_fn = xspi_rx32;
} else {
ret = -EINVAL;
goto put_master;
}
xspi->buffer_size = xilinx_spi_find_buffer_size(xspi); xspi->buffer_size = xilinx_spi_find_buffer_size(xspi);
xspi->irq = platform_get_irq(pdev, 0); xspi->irq = platform_get_irq(pdev, 0);