* [PATCH] spi: spi-atmel: Use correct enum for DMA transfer direction
@ 2018-03-24 10:48 Stefan Agner
2018-03-26 8:03 ` Nicolas Ferre
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Stefan Agner @ 2018-03-24 10:48 UTC (permalink / raw)
To: linux-arm-kernel
Use enum dma_transfer_direction as required by the functions
dmaengine_prep_slave_(sg|single)() instead of enum dma_data_direction.
This won't change behavior in practice as the enum values are
equivalent.
This fixes two warnings when building with clang:
drivers/spi/spi-atmel.c:771:12: warning: implicit conversion from enumeration
type 'enum dma_data_direction' to different enumeration type
'enum dma_transfer_direction'
[-Wenum-conversion]
DMA_FROM_DEVICE,
^~~~~~~~~~~~~~~
...
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
drivers/spi/spi-atmel.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 4a11fc0d4136..6a7844616c65 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -768,14 +768,14 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,
rxdesc = dmaengine_prep_slave_single(rxchan,
as->dma_addr_rx_bbuf,
xfer->len,
- DMA_FROM_DEVICE,
+ DMA_DEV_TO_MEM,
DMA_PREP_INTERRUPT |
DMA_CTRL_ACK);
} else {
rxdesc = dmaengine_prep_slave_sg(rxchan,
xfer->rx_sg.sgl,
xfer->rx_sg.nents,
- DMA_FROM_DEVICE,
+ DMA_DEV_TO_MEM,
DMA_PREP_INTERRUPT |
DMA_CTRL_ACK);
}
@@ -787,14 +787,14 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,
memcpy(as->addr_tx_bbuf, xfer->tx_buf, xfer->len);
txdesc = dmaengine_prep_slave_single(txchan,
as->dma_addr_tx_bbuf,
- xfer->len, DMA_TO_DEVICE,
+ xfer->len, DMA_MEM_TO_DEV,
DMA_PREP_INTERRUPT |
DMA_CTRL_ACK);
} else {
txdesc = dmaengine_prep_slave_sg(txchan,
xfer->tx_sg.sgl,
xfer->tx_sg.nents,
- DMA_TO_DEVICE,
+ DMA_MEM_TO_DEV,
DMA_PREP_INTERRUPT |
DMA_CTRL_ACK);
}
--
2.16.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] spi: spi-atmel: Use correct enum for DMA transfer direction
2018-03-24 10:48 [PATCH] spi: spi-atmel: Use correct enum for DMA transfer direction Stefan Agner
@ 2018-03-26 8:03 ` Nicolas Ferre
2018-03-26 8:39 ` Geert Uytterhoeven
2018-03-28 2:44 ` Applied "spi: spi-atmel: Use correct enum for DMA transfer direction" to the spi tree Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Nicolas Ferre @ 2018-03-26 8:03 UTC (permalink / raw)
To: linux-arm-kernel
On 24/03/2018 at 11:48, Stefan Agner wrote:
> Use enum dma_transfer_direction as required by the functions
> dmaengine_prep_slave_(sg|single)() instead of enum dma_data_direction.
> This won't change behavior in practice as the enum values are
> equivalent.
>
> This fixes two warnings when building with clang:
> drivers/spi/spi-atmel.c:771:12: warning: implicit conversion from enumeration
> type 'enum dma_data_direction' to different enumeration type
> 'enum dma_transfer_direction'
> [-Wenum-conversion]
> DMA_FROM_DEVICE,
> ^~~~~~~~~~~~~~~
> ...
>
> Signed-off-by: Stefan Agner <stefan@agner.ch>
Ok:
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
> ---
> drivers/spi/spi-atmel.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
> index 4a11fc0d4136..6a7844616c65 100644
> --- a/drivers/spi/spi-atmel.c
> +++ b/drivers/spi/spi-atmel.c
> @@ -768,14 +768,14 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,
> rxdesc = dmaengine_prep_slave_single(rxchan,
> as->dma_addr_rx_bbuf,
> xfer->len,
> - DMA_FROM_DEVICE,
> + DMA_DEV_TO_MEM,
> DMA_PREP_INTERRUPT |
> DMA_CTRL_ACK);
> } else {
> rxdesc = dmaengine_prep_slave_sg(rxchan,
> xfer->rx_sg.sgl,
> xfer->rx_sg.nents,
> - DMA_FROM_DEVICE,
> + DMA_DEV_TO_MEM,
> DMA_PREP_INTERRUPT |
> DMA_CTRL_ACK);
> }
> @@ -787,14 +787,14 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,
> memcpy(as->addr_tx_bbuf, xfer->tx_buf, xfer->len);
> txdesc = dmaengine_prep_slave_single(txchan,
> as->dma_addr_tx_bbuf,
> - xfer->len, DMA_TO_DEVICE,
> + xfer->len, DMA_MEM_TO_DEV,
> DMA_PREP_INTERRUPT |
> DMA_CTRL_ACK);
> } else {
> txdesc = dmaengine_prep_slave_sg(txchan,
> xfer->tx_sg.sgl,
> xfer->tx_sg.nents,
> - DMA_TO_DEVICE,
> + DMA_MEM_TO_DEV,
> DMA_PREP_INTERRUPT |
> DMA_CTRL_ACK);
> }
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] spi: spi-atmel: Use correct enum for DMA transfer direction
2018-03-24 10:48 [PATCH] spi: spi-atmel: Use correct enum for DMA transfer direction Stefan Agner
2018-03-26 8:03 ` Nicolas Ferre
@ 2018-03-26 8:39 ` Geert Uytterhoeven
2018-03-28 2:44 ` Applied "spi: spi-atmel: Use correct enum for DMA transfer direction" to the spi tree Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2018-03-26 8:39 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Mar 24, 2018 at 11:48 AM, Stefan Agner <stefan@agner.ch> wrote:
> Use enum dma_transfer_direction as required by the functions
> dmaengine_prep_slave_(sg|single)() instead of enum dma_data_direction.
> This won't change behavior in practice as the enum values are
> equivalent.
>
> This fixes two warnings when building with clang:
> drivers/spi/spi-atmel.c:771:12: warning: implicit conversion from enumeration
> type 'enum dma_data_direction' to different enumeration type
> 'enum dma_transfer_direction'
> [-Wenum-conversion]
> DMA_FROM_DEVICE,
> ^~~~~~~~~~~~~~~
> ...
>
> Signed-off-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 4+ messages in thread* Applied "spi: spi-atmel: Use correct enum for DMA transfer direction" to the spi tree
2018-03-24 10:48 [PATCH] spi: spi-atmel: Use correct enum for DMA transfer direction Stefan Agner
2018-03-26 8:03 ` Nicolas Ferre
2018-03-26 8:39 ` Geert Uytterhoeven
@ 2018-03-28 2:44 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2018-03-28 2:44 UTC (permalink / raw)
To: linux-arm-kernel
The patch
spi: spi-atmel: Use correct enum for DMA transfer direction
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 357325764d7eabc4d2169d26af079b441fd48bc5 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Sat, 24 Mar 2018 11:48:00 +0100
Subject: [PATCH] spi: spi-atmel: Use correct enum for DMA transfer direction
Use enum dma_transfer_direction as required by the functions
dmaengine_prep_slave_(sg|single)() instead of enum dma_data_direction.
This won't change behavior in practice as the enum values are
equivalent.
This fixes two warnings when building with clang:
drivers/spi/spi-atmel.c:771:12: warning: implicit conversion from enumeration
type 'enum dma_data_direction' to different enumeration type
'enum dma_transfer_direction'
[-Wenum-conversion]
DMA_FROM_DEVICE,
^~~~~~~~~~~~~~~
...
Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
drivers/spi/spi-atmel.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index b7936f815373..3f890d162934 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -768,14 +768,14 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,
rxdesc = dmaengine_prep_slave_single(rxchan,
as->dma_addr_rx_bbuf,
xfer->len,
- DMA_FROM_DEVICE,
+ DMA_DEV_TO_MEM,
DMA_PREP_INTERRUPT |
DMA_CTRL_ACK);
} else {
rxdesc = dmaengine_prep_slave_sg(rxchan,
xfer->rx_sg.sgl,
xfer->rx_sg.nents,
- DMA_FROM_DEVICE,
+ DMA_DEV_TO_MEM,
DMA_PREP_INTERRUPT |
DMA_CTRL_ACK);
}
@@ -787,14 +787,14 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,
memcpy(as->addr_tx_bbuf, xfer->tx_buf, xfer->len);
txdesc = dmaengine_prep_slave_single(txchan,
as->dma_addr_tx_bbuf,
- xfer->len, DMA_TO_DEVICE,
+ xfer->len, DMA_MEM_TO_DEV,
DMA_PREP_INTERRUPT |
DMA_CTRL_ACK);
} else {
txdesc = dmaengine_prep_slave_sg(txchan,
xfer->tx_sg.sgl,
xfer->tx_sg.nents,
- DMA_TO_DEVICE,
+ DMA_MEM_TO_DEV,
DMA_PREP_INTERRUPT |
DMA_CTRL_ACK);
}
--
2.16.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-03-28 2:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-24 10:48 [PATCH] spi: spi-atmel: Use correct enum for DMA transfer direction Stefan Agner
2018-03-26 8:03 ` Nicolas Ferre
2018-03-26 8:39 ` Geert Uytterhoeven
2018-03-28 2:44 ` Applied "spi: spi-atmel: Use correct enum for DMA transfer direction" to the spi tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).