spi: zynq-qspi: Keep the naming consistent across the driver

In this driver (and also in a lot of other drivers in drivers/spi/),
the spi_controller structure is sometimes referred as 'ctlr' and
sometimes as 'ctrl'. Grepping there shows that 'ctlr' seems to be more
common so keep the naming consistent in this driver and s/ctrl/ctlr/.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/r/20191108105920.19014-3-miquel.raynal@bootlin.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-zynq-qspi.c b/drivers/spi/spi-zynq-qspi.c
index 8786054f48691854f1ef6f4ebf1994c6acc30e31..b1c56e9d7c94c5a88d36a6b4c58fa7d26e8abfd1 100644 (file)
--- a/drivers/spi/spi-zynq-qspi.c
+++ b/drivers/spi/spi-zynq-qspi.c
@@ -283,8 +283,8 @@ static void zynq_qspi_txfifo_op(struct zynq_qspi *xqspi, unsigned int size)
  */
 static void zynq_qspi_chipselect(struct spi_device *spi, bool assert)
 {
-       struct spi_controller *ctrl = spi->master;
-       struct zynq_qspi *xqspi = spi_controller_get_devdata(ctrl);
+       struct spi_controller *ctlr = spi->master;
+       struct zynq_qspi *xqspi = spi_controller_get_devdata(ctlr);
        u32 config_reg;
 
        config_reg = zynq_qspi_read(xqspi, ZYNQ_QSPI_CONFIG_OFFSET);
@@ -364,10 +364,10 @@ static int zynq_qspi_config_op(struct zynq_qspi *xqspi, struct spi_device *spi)
  */
 static int zynq_qspi_setup_op(struct spi_device *spi)
 {
-       struct spi_controller *ctrl = spi->master;
-       struct zynq_qspi *qspi = spi_controller_get_devdata(ctrl);
+       struct spi_controller *ctlr = spi->master;
+       struct zynq_qspi *qspi = spi_controller_get_devdata(ctlr);
 
-       if (ctrl->busy)
+       if (ctlr->busy)
                return -EBUSY;
 
        clk_enable(qspi->refclk);