Skip to content

Commit d9032b3

Browse files
Villemoesbroonie
authored andcommitted
spi: spi-imx: use "controller" variable consistently in spi_imx_probe()
Near the top of the function, spi_imx->controller is set to controller (and is of course never modified again). The rest of the function uses a mix of the two expressions. For consistency, readability and better code generation, drop all the spi_imx-> indirections. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Link: https://lore.kernel.org/r/20230425134527.483607-2-linux@rasmusvillemoes.dk Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent b6e4686 commit d9032b3

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

drivers/spi/spi-imx.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1737,20 +1737,20 @@ static int spi_imx_probe(struct platform_device *pdev)
17371737
else
17381738
controller->num_chipselect = 3;
17391739

1740-
spi_imx->controller->transfer_one = spi_imx_transfer_one;
1741-
spi_imx->controller->setup = spi_imx_setup;
1742-
spi_imx->controller->cleanup = spi_imx_cleanup;
1743-
spi_imx->controller->prepare_message = spi_imx_prepare_message;
1744-
spi_imx->controller->unprepare_message = spi_imx_unprepare_message;
1745-
spi_imx->controller->slave_abort = spi_imx_slave_abort;
1746-
spi_imx->controller->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_NO_CS;
1740+
controller->transfer_one = spi_imx_transfer_one;
1741+
controller->setup = spi_imx_setup;
1742+
controller->cleanup = spi_imx_cleanup;
1743+
controller->prepare_message = spi_imx_prepare_message;
1744+
controller->unprepare_message = spi_imx_unprepare_message;
1745+
controller->slave_abort = spi_imx_slave_abort;
1746+
controller->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_NO_CS;
17471747

17481748
if (is_imx35_cspi(spi_imx) || is_imx51_ecspi(spi_imx) ||
17491749
is_imx53_ecspi(spi_imx))
1750-
spi_imx->controller->mode_bits |= SPI_LOOP | SPI_READY;
1750+
controller->mode_bits |= SPI_LOOP | SPI_READY;
17511751

17521752
if (is_imx51_ecspi(spi_imx) || is_imx53_ecspi(spi_imx))
1753-
spi_imx->controller->mode_bits |= SPI_RX_CPHA_FLIP;
1753+
controller->mode_bits |= SPI_RX_CPHA_FLIP;
17541754

17551755
if (is_imx51_ecspi(spi_imx) &&
17561756
device_property_read_u32(&pdev->dev, "cs-gpios", NULL))
@@ -1759,7 +1759,7 @@ static int spi_imx_probe(struct platform_device *pdev)
17591759
* setting the burst length to the word size. This is
17601760
* considerably faster than manually controlling the CS.
17611761
*/
1762-
spi_imx->controller->mode_bits |= SPI_CS_WORD;
1762+
controller->mode_bits |= SPI_CS_WORD;
17631763

17641764
spi_imx->spi_drctl = spi_drctl;
17651765

0 commit comments

Comments
 (0)