| Message ID | 5c7b7ca7813564f062d9891847b510ce91067585.1557758205.git.lukas@wunner.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | af505208e96050aeddae77940b5a4438a7e27dcc |
| Headers | show |
| Series | spi: bcm2835: Drop assignment of dma_slave_config direction | expand |
On 13-05-19, 16:48, Lukas Wunner wrote: > The BCM2835 SPI driver still sets the "direction" member in struct > dma_slave_config even though it was deprecated five years ago with > commit d9ff958bb34a ("dmaengine: Mark the struct dma_slave_config > direction field deprecated") and is no longer evaluated by the BCM2835 > DMA driver since commit 00648f4d0f41 ("dmaengine: bcm2835: remove > dma_slave_config direction usage"). Great, thanks for doing this. Reviewed-by: Vinod Koul <vkoul@kernel.org> > > Drop the superfluous assignment. > No functional change intended. > > Signed-off-by: Lukas Wunner <lukas@wunner.de> > Cc: Frank Pavlic <f.pavlic@kunbus.de> > Cc: Martin Sperl <kernel@martin.sperl.org> > Cc: Noralf Trønnes <noralf@tronnes.org> > --- > drivers/spi/spi-bcm2835.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c > index 1c34a7bcdb7f..9c03da7c18dd 100644 > --- a/drivers/spi/spi-bcm2835.c > +++ b/drivers/spi/spi-bcm2835.c > @@ -729,7 +729,6 @@ static void bcm2835_dma_init(struct spi_controller *ctlr, struct device *dev) > } > > /* configure DMAs */ > - slave_config.direction = DMA_MEM_TO_DEV; > slave_config.dst_addr = (u32)(dma_reg_base + BCM2835_SPI_FIFO); > slave_config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; > > @@ -737,7 +736,6 @@ static void bcm2835_dma_init(struct spi_controller *ctlr, struct device *dev) > if (ret) > goto err_config; > > - slave_config.direction = DMA_DEV_TO_MEM; > slave_config.src_addr = (u32)(dma_reg_base + BCM2835_SPI_FIFO); > slave_config.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; > > -- > 2.20.1
diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index 1c34a7bcdb7f..9c03da7c18dd 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -729,7 +729,6 @@ static void bcm2835_dma_init(struct spi_controller *ctlr, struct device *dev) } /* configure DMAs */ - slave_config.direction = DMA_MEM_TO_DEV; slave_config.dst_addr = (u32)(dma_reg_base + BCM2835_SPI_FIFO); slave_config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; @@ -737,7 +736,6 @@ static void bcm2835_dma_init(struct spi_controller *ctlr, struct device *dev) if (ret) goto err_config; - slave_config.direction = DMA_DEV_TO_MEM; slave_config.src_addr = (u32)(dma_reg_base + BCM2835_SPI_FIFO); slave_config.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
The BCM2835 SPI driver still sets the "direction" member in struct dma_slave_config even though it was deprecated five years ago with commit d9ff958bb34a ("dmaengine: Mark the struct dma_slave_config direction field deprecated") and is no longer evaluated by the BCM2835 DMA driver since commit 00648f4d0f41 ("dmaengine: bcm2835: remove dma_slave_config direction usage"). Drop the superfluous assignment. No functional change intended. Signed-off-by: Lukas Wunner <lukas@wunner.de> Cc: Frank Pavlic <f.pavlic@kunbus.de> Cc: Martin Sperl <kernel@martin.sperl.org> Cc: Noralf Trønnes <noralf@tronnes.org> --- drivers/spi/spi-bcm2835.c | 2 -- 1 file changed, 2 deletions(-)