spi: bcm3835: Tidy up bcm2835_spi_reset_hw()

It doesn't need a struct spi_controller, and every callsite has
already retrieved the appropriate struct bcm2835_spi, so just pass
that directly.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/eca458ae1a0d3934d0627f90e25d294fefd4b13d.1592261248.git.robin.murphy@arm.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index 237bd306c26853aa3ba6f1c402455ea9cd18a4dc..524a91e52111236006240432b02ba6c2d8e9ff68 100644 (file)
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -335,9 +335,8 @@ static inline void bcm2835_wr_fifo_blind(struct bcm2835_spi *bs, int count)
        }
 }
 
-static void bcm2835_spi_reset_hw(struct spi_controller *ctlr)
+static void bcm2835_spi_reset_hw(struct bcm2835_spi *bs)
 {
-       struct bcm2835_spi *bs = spi_controller_get_devdata(ctlr);
        u32 cs = bcm2835_rd(bs, BCM2835_SPI_CS);
 
        /* Disable SPI interrupts and transfer */
@@ -386,7 +385,7 @@ static irqreturn_t bcm2835_spi_interrupt(int irq, void *dev_id)
 
        if (!bs->rx_len) {
                /* Transfer complete - reset SPI HW */
-               bcm2835_spi_reset_hw(ctlr);
+               bcm2835_spi_reset_hw(bs);
                /* wake up the framework */
                complete(&ctlr->xfer_completion);
        }
@@ -607,7 +606,7 @@ static void bcm2835_spi_dma_rx_done(void *data)
        bcm2835_spi_undo_prologue(bs);
 
        /* reset fifo and HW */
-       bcm2835_spi_reset_hw(ctlr);
+       bcm2835_spi_reset_hw(bs);
 
        /* and mark as completed */;
        complete(&ctlr->xfer_completion);
@@ -641,7 +640,7 @@ static void bcm2835_spi_dma_tx_done(void *data)
                dmaengine_terminate_async(ctlr->dma_rx);
 
        bcm2835_spi_undo_prologue(bs);
-       bcm2835_spi_reset_hw(ctlr);
+       bcm2835_spi_reset_hw(bs);
        complete(&ctlr->xfer_completion);
 }
 
@@ -825,14 +824,14 @@ static int bcm2835_spi_transfer_one_dma(struct spi_controller *ctlr,
        if (!bs->rx_buf && !bs->tx_dma_active &&
            cmpxchg(&bs->rx_dma_active, true, false)) {
                dmaengine_terminate_async(ctlr->dma_rx);
-               bcm2835_spi_reset_hw(ctlr);
+               bcm2835_spi_reset_hw(bs);
        }
 
        /* wait for wakeup in framework */
        return 1;
 
 err_reset_hw:
-       bcm2835_spi_reset_hw(ctlr);
+       bcm2835_spi_reset_hw(bs);
        bcm2835_spi_undo_prologue(bs);
        return ret;
 }
@@ -1074,7 +1073,7 @@ static int bcm2835_spi_transfer_one_poll(struct spi_controller *ctlr,
        }
 
        /* Transfer complete - reset SPI HW */
-       bcm2835_spi_reset_hw(ctlr);
+       bcm2835_spi_reset_hw(bs);
        /* and return without waiting for completion */
        return 0;
 }
@@ -1182,7 +1181,7 @@ static void bcm2835_spi_handle_err(struct spi_controller *ctlr,
        bcm2835_spi_undo_prologue(bs);
 
        /* and reset */
-       bcm2835_spi_reset_hw(ctlr);
+       bcm2835_spi_reset_hw(bs);
 }
 
 static int chip_match_name(struct gpio_chip *chip, void *data)