浏览代码

spi/xilinx: Make spi_tx and spi_rx simmetric

spi_rx handles the case where the buffer is null. Nevertheless spi_tx
did not handle it, and was handled by the caller function.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Ricardo Ribalda Delgado 10 年之前
父节点
当前提交
c30929415a
共有 1 个文件被更改,包括 5 次插入4 次删除
  1. 5 4
      drivers/spi/spi-xilinx.c

+ 5 - 4
drivers/spi/spi-xilinx.c

@@ -116,6 +116,10 @@ static unsigned int xspi_read32_be(void __iomem *addr)
 
 
 static void xilinx_spi_tx(struct xilinx_spi *xspi)
 static void xilinx_spi_tx(struct xilinx_spi *xspi)
 {
 {
+	if (!xspi->tx_ptr) {
+		xspi->write_fn(0, xspi->regs + XSPI_TXD_OFFSET);
+		return;
+	}
 	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 += xspi->bits_per_word / 8;
 	xspi->tx_ptr += xspi->bits_per_word / 8;
 }
 }
@@ -230,10 +234,7 @@ 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_bytes -= n_words * xspi->bits_per_word / 8;
 
 
 	while (n_words--)
 	while (n_words--)
-		if (xspi->tx_ptr)
-			xilinx_spi_tx(xspi);
-		else
-			xspi->write_fn(0, xspi->regs + XSPI_TXD_OFFSET);
+		xilinx_spi_tx(xspi);
 	return;
 	return;
 }
 }