kevin/linux
1
Fork 0
Code

spi: spi-mt65xx: Rename a variable in interrupt handler

Browse Source 
All the spi_transfer variables in this file use the name "xfer" except
the one in mtk_spi_interrupt(). Align the naming for consistency and
easier searching.

While at it, reformat one memcpy() usage since the coding style allows
100 column lines today.

This commit has no functional change.

Signed-off-by: Fei Shao <fshao@chromium.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://msgid.link/r/20240321070942.1587146-3-fshao@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Fei Shao 2024-03-21 15:08:58 +08:00 committed by Mark Brown
parent 2a741cd6ec
commit 10402419f2
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/spi/spi-mt65xx.c
View File

@ -748,7 +748,7 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id)
u32 cmd, reg_val, cnt, remainder, len; u32 cmd, reg_val, cnt, remainder, len;
struct spi_controller *host = dev_id; struct spi_controller *host = dev_id;
struct mtk_spi *mdata = spi_controller_get_devdata(host); struct mtk_spi *mdata = spi_controller_get_devdata(host);
struct spi_transfer *trans = mdata->cur_transfer; struct spi_transfer *xfer = mdata->cur_transfer;
reg_val = readl(mdata->base + SPI_STATUS0_REG); reg_val = readl(mdata->base + SPI_STATUS0_REG);
if (reg_val & MTK_SPI_PAUSE_INT_STATUS) if (reg_val & MTK_SPI_PAUSE_INT_STATUS)
@ -762,42 +762,40 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
if (!host->can_dma(host, NULL, trans)) { if (!host->can_dma(host, NULL, xfer)) {
if (trans->rx_buf) { if (xfer->rx_buf) {
cnt = mdata->xfer_len / 4; cnt = mdata->xfer_len / 4;
ioread32_rep(mdata->base + SPI_RX_DATA_REG, ioread32_rep(mdata->base + SPI_RX_DATA_REG,
trans->rx_buf + mdata->num_xfered, cnt); xfer->rx_buf + mdata->num_xfered, cnt);
remainder = mdata->xfer_len % 4; remainder = mdata->xfer_len % 4;
if (remainder > 0) { if (remainder > 0) {
reg_val = readl(mdata->base + SPI_RX_DATA_REG); reg_val = readl(mdata->base + SPI_RX_DATA_REG);
memcpy(trans->rx_buf + memcpy(xfer->rx_buf + (cnt * 4) + mdata->num_xfered,
mdata->num_xfered +
(cnt * 4),
&reg_val, &reg_val,
remainder); remainder);
} }
} }
mdata->num_xfered += mdata->xfer_len; mdata->num_xfered += mdata->xfer_len;
if (mdata->num_xfered == trans->len) { if (mdata->num_xfered == xfer->len) {
spi_finalize_current_transfer(host); spi_finalize_current_transfer(host);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
len = trans->len - mdata->num_xfered; len = xfer->len - mdata->num_xfered;
mdata->xfer_len = min(MTK_SPI_MAX_FIFO_SIZE, len); mdata->xfer_len = min(MTK_SPI_MAX_FIFO_SIZE, len);
mtk_spi_setup_packet(host); mtk_spi_setup_packet(host);
if (trans->tx_buf) { if (xfer->tx_buf) {
cnt = mdata->xfer_len / 4; cnt = mdata->xfer_len / 4;
iowrite32_rep(mdata->base + SPI_TX_DATA_REG, iowrite32_rep(mdata->base + SPI_TX_DATA_REG,
trans->tx_buf + mdata->num_xfered, cnt); xfer->tx_buf + mdata->num_xfered, cnt);
remainder = mdata->xfer_len % 4; remainder = mdata->xfer_len % 4;
if (remainder > 0) { if (remainder > 0) {
reg_val = 0; reg_val = 0;
memcpy(&reg_val, memcpy(&reg_val,
trans->tx_buf + (cnt * 4) + mdata->num_xfered, xfer->tx_buf + (cnt * 4) + mdata->num_xfered,
remainder); remainder);
writel(reg_val, mdata->base + SPI_TX_DATA_REG); writel(reg_val, mdata->base + SPI_TX_DATA_REG);
} }
@ -809,21 +807,21 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id)
} }
if (mdata->tx_sgl) if (mdata->tx_sgl)
trans->tx_dma += mdata->xfer_len; xfer->tx_dma += mdata->xfer_len;
if (mdata->rx_sgl) if (mdata->rx_sgl)
trans->rx_dma += mdata->xfer_len; xfer->rx_dma += mdata->xfer_len;
if (mdata->tx_sgl && (mdata->tx_sgl_len == 0)) { if (mdata->tx_sgl && (mdata->tx_sgl_len == 0)) {
mdata->tx_sgl = sg_next(mdata->tx_sgl); mdata->tx_sgl = sg_next(mdata->tx_sgl);
if (mdata->tx_sgl) { if (mdata->tx_sgl) {
trans->tx_dma = sg_dma_address(mdata->tx_sgl); xfer->tx_dma = sg_dma_address(mdata->tx_sgl);
mdata->tx_sgl_len = sg_dma_len(mdata->tx_sgl); mdata->tx_sgl_len = sg_dma_len(mdata->tx_sgl);
} }
} }
if (mdata->rx_sgl && (mdata->rx_sgl_len == 0)) { if (mdata->rx_sgl && (mdata->rx_sgl_len == 0)) {
mdata->rx_sgl = sg_next(mdata->rx_sgl); mdata->rx_sgl = sg_next(mdata->rx_sgl);
if (mdata->rx_sgl) { if (mdata->rx_sgl) {
trans->rx_dma = sg_dma_address(mdata->rx_sgl); xfer->rx_dma = sg_dma_address(mdata->rx_sgl);
mdata->rx_sgl_len = sg_dma_len(mdata->rx_sgl); mdata->rx_sgl_len = sg_dma_len(mdata->rx_sgl);
} }
} }
@ -841,7 +839,7 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id)
mtk_spi_update_mdata_len(host); mtk_spi_update_mdata_len(host);
mtk_spi_setup_packet(host); mtk_spi_setup_packet(host);
mtk_spi_setup_dma_addr(host, trans); mtk_spi_setup_dma_addr(host, xfer);
mtk_spi_enable_transfer(host); mtk_spi_enable_transfer(host);
return IRQ_HANDLED; return IRQ_HANDLED;