From 3a3f10c06e2a5cadaad0a5a29ac861b50effecb3 Mon Sep 17 00:00:00 2001
From: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Date: Wed, 29 Jul 2020 08:55:43 +0200
Subject: [PATCH] drivers: dma: Align all drivers using dma_callback_t type

No need to re-declare such signature anymore.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
---
 drivers/dma/dma_dw.h           | 6 ++----
 drivers/dma/dma_mcux_edma.c    | 3 +--
 drivers/dma/dma_nios2_msgdma.c | 3 +--
 drivers/dma/dma_pl330.h        | 5 +----
 drivers/dma/dma_sam0.c         | 5 +----
 drivers/dma/dma_sam_xdmac.c    | 2 +-
 drivers/dma/dma_sam_xdmac.h    | 4 ----
 drivers/dma/dma_stm32.h        | 3 +--
 8 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/drivers/dma/dma_dw.h b/drivers/dma/dma_dw.h
index 13a778062d1..42794881bf8 100644
--- a/drivers/dma/dma_dw.h
+++ b/drivers/dma/dma_dw.h
@@ -32,11 +32,9 @@ extern "C" {
 struct dma_chan_data {
 	uint32_t direction;
 	void *blkcallback_arg;
-	void (*dma_blkcallback)(struct device *dev, void *arg,
-				uint32_t channel, int error_code);
+	dma_callback_t dma_blkcallback;
 	void *tfrcallback_arg;
-	void (*dma_tfrcallback)(struct device *dev, void *arg,
-				uint32_t channel, int error_code);
+	dma_callback_t dma_tfrcallback;
 };
 
 #define DW_MAX_CHAN		8
diff --git a/drivers/dma/dma_mcux_edma.c b/drivers/dma/dma_mcux_edma.c
index 1544c5ee1a5..7f585dac81c 100644
--- a/drivers/dma/dma_mcux_edma.c
+++ b/drivers/dma/dma_mcux_edma.c
@@ -39,8 +39,7 @@ struct call_back {
 	edma_handle_t edma_handle;
 	struct device *dev;
 	void *callback_arg;
-	void (*dma_callback)(struct device *dev, void *callback_arg,
-			     uint32_t channel, int error_code);
+	dma_callback_t dma_callback;
 	enum dma_channel_direction dir;
 	bool busy;
 };
diff --git a/drivers/dma/dma_nios2_msgdma.c b/drivers/dma/dma_nios2_msgdma.c
index af3effbbeb6..ee585109e59 100644
--- a/drivers/dma/dma_nios2_msgdma.c
+++ b/drivers/dma/dma_nios2_msgdma.c
@@ -26,8 +26,7 @@ struct nios2_msgdma_dev_cfg {
 	uint32_t direction;
 	struct k_sem sem_lock;
 	void *callback_arg;
-	void (*dma_callback)(struct device *dev, void *arg,
-			     uint32_t id, int error_code);
+	dma_callback_t dma_callback;
 };
 
 #define DEV_NAME(dev) ((dev)->name)
diff --git a/drivers/dma/dma_pl330.h b/drivers/dma/dma_pl330.h
index 8b7cbb44487..462b89845ec 100644
--- a/drivers/dma/dma_pl330.h
+++ b/drivers/dma/dma_pl330.h
@@ -133,9 +133,6 @@ struct dma_pl330_ch_internal {
 	int nonsec_mode;
 };
 
-typedef void (*dma_xfer_callback)(struct device *dev, void *callback_arg,
-				  uint32_t channel, int error_code);
-
 struct dma_pl330_ch_config {
 	/* Channel configuration details */
 	uint64_t src_addr;
@@ -145,7 +142,7 @@ struct dma_pl330_ch_config {
 	enum dma_channel_direction direction;
 	uint32_t trans_size;
 	void *callback_arg;
-	dma_xfer_callback dma_callback;
+	dma_callback_t dma_callback;
 	uint32_t dma_exe_addr;
 	struct k_mutex ch_mutex;
 	int channel_active;
diff --git a/drivers/dma/dma_sam0.c b/drivers/dma/dma_sam0.c
index 4d65f3bcf08..aa8f3ed804a 100644
--- a/drivers/dma/dma_sam0.c
+++ b/drivers/dma/dma_sam0.c
@@ -15,11 +15,8 @@ LOG_MODULE_REGISTER(dma_sam0, CONFIG_DMA_LOG_LEVEL);
 
 #define DMA_REGS	((Dmac *)DT_INST_REG_ADDR(0))
 
-typedef void (*dma_callback)(struct device *dev, void *callback_arg,
-			     uint32_t channel, int error_code);
-
 struct dma_sam0_channel {
-	dma_callback cb;
+	dma_callback_t cb;
 	void *cb_arg;
 };
 
diff --git a/drivers/dma/dma_sam_xdmac.c b/drivers/dma/dma_sam_xdmac.c
index 0f76904920e..d27a49a21b9 100644
--- a/drivers/dma/dma_sam_xdmac.c
+++ b/drivers/dma/dma_sam_xdmac.c
@@ -29,7 +29,7 @@ LOG_MODULE_REGISTER(dma_sam_xdmac);
 /* DMA channel configuration */
 struct sam_xdmac_channel_cfg {
 	void *callback_arg;
-	dma_callback callback;
+	dma_callback_t callback;
 };
 
 /* Device constant configuration parameters */
diff --git a/drivers/dma/dma_sam_xdmac.h b/drivers/dma/dma_sam_xdmac.h
index aeeef23b080..1b20c1d53b8 100644
--- a/drivers/dma/dma_sam_xdmac.h
+++ b/drivers/dma/dma_sam_xdmac.h
@@ -17,10 +17,6 @@
 extern "C" {
 #endif
 
-/** DMA transfer callback */
-typedef void (*dma_callback)(struct device *dev, void *arg,
-			     uint32_t channel, int error_code);
-
 /* XDMA_MBR_UBC */
 #define XDMA_UBC_NDE (0x1u << 24)
 #define   XDMA_UBC_NDE_FETCH_DIS (0x0u << 24)
diff --git a/drivers/dma/dma_stm32.h b/drivers/dma/dma_stm32.h
index a5567203854..10e55ccddbe 100644
--- a/drivers/dma/dma_stm32.h
+++ b/drivers/dma/dma_stm32.h
@@ -20,8 +20,7 @@ struct dma_stm32_stream {
 	uint32_t src_size;
 	uint32_t dst_size;
 	void *callback_arg; /* holds the client data */
-	void (*dma_callback)(struct device *dev, void *arg,
-			     uint32_t id, int error_code);
+	dma_callback_t dma_callback;
 };
 
 struct dma_stm32_data {