tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

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>

authored by

Fei Shao and committed by
Mark Brown 10402419 2a741cd6

+15 -17
+15 -17
drivers/spi/spi-mt65xx.c
··· 748 748 u32 cmd, reg_val, cnt, remainder, len; 749 749 struct spi_controller *host = dev_id; 750 750 struct mtk_spi *mdata = spi_controller_get_devdata(host); 751 - struct spi_transfer *trans = mdata->cur_transfer; 751 + struct spi_transfer *xfer = mdata->cur_transfer; 752 752 753 753 reg_val = readl(mdata->base + SPI_STATUS0_REG); 754 754 if (reg_val & MTK_SPI_PAUSE_INT_STATUS) ··· 762 762 return IRQ_HANDLED; 763 763 } 764 764 765 - if (!host->can_dma(host, NULL, trans)) { 766 - if (trans->rx_buf) { 765 + if (!host->can_dma(host, NULL, xfer)) { 766 + if (xfer->rx_buf) { 767 767 cnt = mdata->xfer_len / 4; 768 768 ioread32_rep(mdata->base + SPI_RX_DATA_REG, 769 - trans->rx_buf + mdata->num_xfered, cnt); 769 + xfer->rx_buf + mdata->num_xfered, cnt); 770 770 remainder = mdata->xfer_len % 4; 771 771 if (remainder > 0) { 772 772 reg_val = readl(mdata->base + SPI_RX_DATA_REG); 773 - memcpy(trans->rx_buf + 774 - mdata->num_xfered + 775 - (cnt * 4), 773 + memcpy(xfer->rx_buf + (cnt * 4) + mdata->num_xfered, 776 774 &reg_val, 777 775 remainder); 778 776 } 779 777 } 780 778 781 779 mdata->num_xfered += mdata->xfer_len; 782 - if (mdata->num_xfered == trans->len) { 780 + if (mdata->num_xfered == xfer->len) { 783 781 spi_finalize_current_transfer(host); 784 782 return IRQ_HANDLED; 785 783 } 786 784 787 - len = trans->len - mdata->num_xfered; 785 + len = xfer->len - mdata->num_xfered; 788 786 mdata->xfer_len = min(MTK_SPI_MAX_FIFO_SIZE, len); 789 787 mtk_spi_setup_packet(host); 790 788 791 - if (trans->tx_buf) { 789 + if (xfer->tx_buf) { 792 790 cnt = mdata->xfer_len / 4; 793 791 iowrite32_rep(mdata->base + SPI_TX_DATA_REG, 794 - trans->tx_buf + mdata->num_xfered, cnt); 792 + xfer->tx_buf + mdata->num_xfered, cnt); 795 793 796 794 remainder = mdata->xfer_len % 4; 797 795 if (remainder > 0) { 798 796 reg_val = 0; 799 797 memcpy(&reg_val, 800 - trans->tx_buf + (cnt * 4) + mdata->num_xfered, 798 + xfer->tx_buf + (cnt * 4) + mdata->num_xfered, 801 799 remainder); 802 800 writel(reg_val, mdata->base + SPI_TX_DATA_REG); 803 801 } ··· 807 809 } 808 810 809 811 if (mdata->tx_sgl) 810 - trans->tx_dma += mdata->xfer_len; 812 + xfer->tx_dma += mdata->xfer_len; 811 813 if (mdata->rx_sgl) 812 - trans->rx_dma += mdata->xfer_len; 814 + xfer->rx_dma += mdata->xfer_len; 813 815 814 816 if (mdata->tx_sgl && (mdata->tx_sgl_len == 0)) { 815 817 mdata->tx_sgl = sg_next(mdata->tx_sgl); 816 818 if (mdata->tx_sgl) { 817 - trans->tx_dma = sg_dma_address(mdata->tx_sgl); 819 + xfer->tx_dma = sg_dma_address(mdata->tx_sgl); 818 820 mdata->tx_sgl_len = sg_dma_len(mdata->tx_sgl); 819 821 } 820 822 } 821 823 if (mdata->rx_sgl && (mdata->rx_sgl_len == 0)) { 822 824 mdata->rx_sgl = sg_next(mdata->rx_sgl); 823 825 if (mdata->rx_sgl) { 824 - trans->rx_dma = sg_dma_address(mdata->rx_sgl); 826 + xfer->rx_dma = sg_dma_address(mdata->rx_sgl); 825 827 mdata->rx_sgl_len = sg_dma_len(mdata->rx_sgl); 826 828 } 827 829 } ··· 839 841 840 842 mtk_spi_update_mdata_len(host); 841 843 mtk_spi_setup_packet(host); 842 - mtk_spi_setup_dma_addr(host, trans); 844 + mtk_spi_setup_dma_addr(host, xfer); 843 845 mtk_spi_enable_transfer(host); 844 846 845 847 return IRQ_HANDLED;