spi: orion: cosmetics - alias long direct_access variables

This change increases the source code readability.
Instead of using `spi->child[cs].direct_access.XXX` use `dir_acc->XXX`.
Instead of using `orion_spi->child[cs].direct_access.vaddr` use `vaddr`.

Signed-off-by: Kosta Zertsekel <zertsekel@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Jan Kundrát <jan.kundrat@cesnet.cz>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index 47ef6b1a2e766dca6f080fcc5365b1780921cec4..7f280567093ec674b705e257cb7c25f132526316 100644 (file)
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -431,6 +431,7 @@ orion_spi_write_read(struct spi_device *spi, struct spi_transfer *xfer)
        int word_len;
        struct orion_spi *orion_spi;
        int cs = spi->chip_select;
+       void __iomem *vaddr;
 
        word_len = spi->bits_per_word;
        count = xfer->len;
@@ -441,8 +442,9 @@ orion_spi_write_read(struct spi_device *spi, struct spi_transfer *xfer)
         * Use SPI direct write mode if base address is available. Otherwise
         * fall back to PIO mode for this transfer.
         */
-       if ((orion_spi->child[cs].direct_access.vaddr) && (xfer->tx_buf) &&
-           (word_len == 8)) {
+       vaddr = orion_spi->child[cs].direct_access.vaddr;
+
+       if (vaddr && xfer->tx_buf && word_len == 8) {
                unsigned int cnt = count / 4;
                unsigned int rem = count % 4;
 
@@ -450,13 +452,11 @@ orion_spi_write_read(struct spi_device *spi, struct spi_transfer *xfer)
                 * Send the TX-data to the SPI device via the direct
                 * mapped address window
                 */
-               iowrite32_rep(orion_spi->child[cs].direct_access.vaddr,
-                             xfer->tx_buf, cnt);
+               iowrite32_rep(vaddr, xfer->tx_buf, cnt);
                if (rem) {
                        u32 *buf = (u32 *)xfer->tx_buf;
 
-                       iowrite8_rep(orion_spi->child[cs].direct_access.vaddr,
-                                    &buf[cnt], rem);
+                       iowrite8_rep(vaddr, &buf[cnt], rem);
                }
 
                return count;
@@ -683,6 +683,7 @@ static int orion_spi_probe(struct platform_device *pdev)
        }
 
        for_each_available_child_of_node(pdev->dev.of_node, np) {
+               struct orion_direct_acc *dir_acc;
                u32 cs;
                int cs_gpio;
 
@@ -750,14 +751,13 @@ static int orion_spi_probe(struct platform_device *pdev)
                 * This needs to get extended for the direct SPI-NOR / SPI-NAND
                 * support, once this gets implemented.
                 */
-               spi->child[cs].direct_access.vaddr = devm_ioremap(&pdev->dev,
-                                                           r->start,
-                                                           PAGE_SIZE);
-               if (!spi->child[cs].direct_access.vaddr) {
+               dir_acc = &spi->child[cs].direct_access;
+               dir_acc->vaddr = devm_ioremap(&pdev->dev, r->start, PAGE_SIZE);
+               if (!dir_acc->vaddr) {
                        status = -ENOMEM;
                        goto out_rel_axi_clk;
                }
-               spi->child[cs].direct_access.size = PAGE_SIZE;
+               dir_acc->size = PAGE_SIZE;
 
                dev_info(&pdev->dev, "CS%d configured for direct access\n", cs);
        }