2020-01-21 09:35:25

by Geert Uytterhoeven

Subject: [PATCH v2 0/3] dmaengine: Miscellaneous cleanups

From: Geert Uytterhoeven <[email protected]>

Hi Vinod,

This patch series contains a few miscellaneous cleanups for the DMA
engine code and API.

Changes compared to v1:
- Add Acked-by,
- Rebase on top of today's slave-dma/next.

Thanks!

Geert Uytterhoeven (3):
dmaengine: Remove dma_device_satisfies_mask() wrapper
dmaengine: Remove dma_request_slave_channel_compat() wrapper
dmaengine: Move dma_get_{,any_}slave_channel() to private dmaengine.h

drivers/dma/dmaengine.c | 9 +++------
drivers/dma/dmaengine.h | 3 +++
drivers/dma/of-dma.c | 2 ++
include/linux/dmaengine.h | 8 ++------
4 files changed, 10 insertions(+), 12 deletions(-)

--
2.17.1

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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

2020-01-21 09:35:48

by Geert Uytterhoeven

Subject: [PATCH v2 3/3] dmaengine: Move dma_get_{,any_}slave_channel() to private dmaengine.h

The functions dma_get_slave_channel() and dma_get_any_slave_channel()
are called from DMA engine drivers only. Hence move their declarations
from the public header file <linux/dmaengine.h> to the private header
file drivers/dma/dmaengine.h.

Signed-off-by: Geert Uytterhoeven <[email protected]>
Acked-by: Arnd Bergmann <[email protected]>
---
v2:
- Add Acked-by,
- Rebase on top of today's slave-dma/next.
---
drivers/dma/dmaengine.h | 3 +++
drivers/dma/of-dma.c | 2 ++
include/linux/dmaengine.h | 2 --
3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/dmaengine.h b/drivers/dma/dmaengine.h
index b0b97475707a789f..e8a320c9e57c2d74 100644
--- a/drivers/dma/dmaengine.h
+++ b/drivers/dma/dmaengine.h
@@ -179,4 +179,7 @@ dmaengine_desc_callback_valid(struct dmaengine_desc_callback *cb)
return (cb->callback) ? true : false;
}

+struct dma_chan *dma_get_slave_channel(struct dma_chan *chan);
+struct dma_chan *dma_get_any_slave_channel(struct dma_device *device);
+
#endif
diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c
index c2d779daa4b51ac8..b2c2b5e8093cf0d7 100644
--- a/drivers/dma/of-dma.c
+++ b/drivers/dma/of-dma.c
@@ -15,6 +15,8 @@
#include <linux/of.h>
#include <linux/of_dma.h>

+#include "dmaengine.h"
+
static LIST_HEAD(of_dma_list);
static DEFINE_MUTEX(of_dma_lock);

diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 230d50ef7360ecee..9cc0e70e7c3543a9 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -1522,8 +1522,6 @@ int dma_async_device_register(struct dma_device *device);
int dmaenginem_async_device_register(struct dma_device *device);
void dma_async_device_unregister(struct dma_device *device);
void dma_run_dependencies(struct dma_async_tx_descriptor *tx);
-struct dma_chan *dma_get_slave_channel(struct dma_chan *chan);
-struct dma_chan *dma_get_any_slave_channel(struct dma_device *device);
#define dma_request_channel(mask, x, y) \
__dma_request_channel(&(mask), x, y, NULL)

--
2.17.1

2020-01-21 09:37:13

by Vinod Koul

Subject: Re: [PATCH v2 0/3] dmaengine: Miscellaneous cleanups

On 21-01-20, 10:33, Geert Uytterhoeven wrote:
> From: Geert Uytterhoeven <[email protected]>
>
> Hi Vinod,
>
> This patch series contains a few miscellaneous cleanups for the DMA
> engine code and API.
>
> Changes compared to v1:
> - Add Acked-by,
> - Rebase on top of today's slave-dma/next.

Thanks for the quick rebase :), applied now

--
~Vinod