From: Vinod Koul <vinod.koul@intel.com> To: Olof Johansson <olof@lixom.net>, Joel Fernandes <joelf@ti.com> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>, Sebastian Andrzej Siewior <sebastian@breakpoint.cc>, Dan Williams <dan.j.williams@intel.com>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, Russell King - ARM Linux <linux@arm.linux.org.uk>, Sekhar Nori <nsekhar@ti.com>, Matt Porter <matt.porter@linaro.org> Subject: Re: [PATCH 01/28] dmaengine: use DMA_COMPLETE for dma completion status Date: Wed, 30 Oct 2013 18:33:25 +0530 [thread overview] Message-ID: <20131030130325.GA18788@intel.com> (raw) In-Reply-To: <CAOesGMivD_3zSL503R0OaqyGv4Rj8qJqnbM2TdmjtxR2U63ztw@mail.gmail.com> On Tue, Oct 29, 2013 at 09:47:55AM -0700, Olof Johansson wrote: > This patch broke some TI platforms (using edma) due to namespace > conflicts. The error is: > > ../../include/linux/dmaengine.h:54:2: error: expected identifier > before numeric constant (for DMA_COMPLETE) > > .. it's because they define DMA_COMPLETE in include/platform_data/edma.h. > > The edma driver seems to overall lack prefixes and thus pollutes > global namespaces, so it should be fixed up. Yup this needs some work. I fixed up the error with below, can you pls verify. Pls note this is compile tested only! -----><8--------------------------- From: Vinod Koul <vinod.koul@intel.com> Date: Wed, 30 Oct 2013 18:22:30 +0530 Subject: [PATCH] dmanengine: fix edma driver to not define DMA_COMPLETE edma header defines DMA_COMPLETE, this causes issues as commit adfedd9a32e4 move DMA_SUCCESS to DMA_COMPLETE. edma should properly namespace its defines and needs a future fix Reported-by: Olof Johansson <olof@lixom.net> Signed-off-by: Vinod Koul <vinod.koul@intel.com> --- arch/arm/common/edma.c | 4 ++-- drivers/dma/edma.c | 4 ++-- include/linux/platform_data/edma.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c index 8e1a024..41bca32 100644 --- a/arch/arm/common/edma.c +++ b/arch/arm/common/edma.c @@ -404,7 +404,7 @@ static irqreturn_t dma_irq_handler(int irq, void *data) BIT(slot)); if (edma_cc[ctlr]->intr_data[channel].callback) edma_cc[ctlr]->intr_data[channel].callback( - channel, DMA_COMPLETE, + channel, EDMA_DMA_COMPLETE, edma_cc[ctlr]->intr_data[channel].data); } } while (sh_ipr); @@ -459,7 +459,7 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data) callback) { edma_cc[ctlr]->intr_data[k]. callback(k, - DMA_CC_ERROR, + EDMA_DMA_CC_ERROR, edma_cc[ctlr]->intr_data [k].data); } diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 29fa358..cb69f3a 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -407,7 +407,7 @@ static void edma_callback(unsigned ch_num, u16 ch_status, void *data) edma_pause(echan->ch_num); switch (ch_status) { - case DMA_COMPLETE: + case EDMA_DMA_COMPLETE: spin_lock_irqsave(&echan->vchan.lock, flags); edesc = echan->edesc; @@ -426,7 +426,7 @@ static void edma_callback(unsigned ch_num, u16 ch_status, void *data) spin_unlock_irqrestore(&echan->vchan.lock, flags); break; - case DMA_CC_ERROR: + case EDMA_DMA_CC_ERROR: spin_lock_irqsave(&echan->vchan.lock, flags); edma_read_slot(EDMA_CHAN_SLOT(echan->slot[0]), &p); diff --git a/include/linux/platform_data/edma.h b/include/linux/platform_data/edma.h index 179fb91..f50821c 100644 --- a/include/linux/platform_data/edma.h +++ b/include/linux/platform_data/edma.h @@ -67,10 +67,10 @@ struct edmacc_param { #define ITCCHEN BIT(23) /*ch_status paramater of callback function possible values*/ -#define DMA_COMPLETE 1 -#define DMA_CC_ERROR 2 -#define DMA_TC1_ERROR 3 -#define DMA_TC2_ERROR 4 +#define EDMA_DMA_COMPLETE 1 +#define EDMA_DMA_CC_ERROR 2 +#define EDMA_DMA_TC1_ERROR 3 +#define EDMA_DMA_TC2_ERROR 4 enum address_mode { INCR = 0, -- 1.7.0.4 -- ~Vinod
WARNING: multiple messages have this Message-ID (diff)
From: vinod.koul@intel.com (Vinod Koul) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 01/28] dmaengine: use DMA_COMPLETE for dma completion status Date: Wed, 30 Oct 2013 18:33:25 +0530 [thread overview] Message-ID: <20131030130325.GA18788@intel.com> (raw) In-Reply-To: <CAOesGMivD_3zSL503R0OaqyGv4Rj8qJqnbM2TdmjtxR2U63ztw@mail.gmail.com> On Tue, Oct 29, 2013 at 09:47:55AM -0700, Olof Johansson wrote: > This patch broke some TI platforms (using edma) due to namespace > conflicts. The error is: > > ../../include/linux/dmaengine.h:54:2: error: expected identifier > before numeric constant (for DMA_COMPLETE) > > .. it's because they define DMA_COMPLETE in include/platform_data/edma.h. > > The edma driver seems to overall lack prefixes and thus pollutes > global namespaces, so it should be fixed up. Yup this needs some work. I fixed up the error with below, can you pls verify. Pls note this is compile tested only! -----><8--------------------------- From: Vinod Koul <vinod.koul@intel.com> Date: Wed, 30 Oct 2013 18:22:30 +0530 Subject: [PATCH] dmanengine: fix edma driver to not define DMA_COMPLETE edma header defines DMA_COMPLETE, this causes issues as commit adfedd9a32e4 move DMA_SUCCESS to DMA_COMPLETE. edma should properly namespace its defines and needs a future fix Reported-by: Olof Johansson <olof@lixom.net> Signed-off-by: Vinod Koul <vinod.koul@intel.com> --- arch/arm/common/edma.c | 4 ++-- drivers/dma/edma.c | 4 ++-- include/linux/platform_data/edma.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c index 8e1a024..41bca32 100644 --- a/arch/arm/common/edma.c +++ b/arch/arm/common/edma.c @@ -404,7 +404,7 @@ static irqreturn_t dma_irq_handler(int irq, void *data) BIT(slot)); if (edma_cc[ctlr]->intr_data[channel].callback) edma_cc[ctlr]->intr_data[channel].callback( - channel, DMA_COMPLETE, + channel, EDMA_DMA_COMPLETE, edma_cc[ctlr]->intr_data[channel].data); } } while (sh_ipr); @@ -459,7 +459,7 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data) callback) { edma_cc[ctlr]->intr_data[k]. callback(k, - DMA_CC_ERROR, + EDMA_DMA_CC_ERROR, edma_cc[ctlr]->intr_data [k].data); } diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 29fa358..cb69f3a 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -407,7 +407,7 @@ static void edma_callback(unsigned ch_num, u16 ch_status, void *data) edma_pause(echan->ch_num); switch (ch_status) { - case DMA_COMPLETE: + case EDMA_DMA_COMPLETE: spin_lock_irqsave(&echan->vchan.lock, flags); edesc = echan->edesc; @@ -426,7 +426,7 @@ static void edma_callback(unsigned ch_num, u16 ch_status, void *data) spin_unlock_irqrestore(&echan->vchan.lock, flags); break; - case DMA_CC_ERROR: + case EDMA_DMA_CC_ERROR: spin_lock_irqsave(&echan->vchan.lock, flags); edma_read_slot(EDMA_CHAN_SLOT(echan->slot[0]), &p); diff --git a/include/linux/platform_data/edma.h b/include/linux/platform_data/edma.h index 179fb91..f50821c 100644 --- a/include/linux/platform_data/edma.h +++ b/include/linux/platform_data/edma.h @@ -67,10 +67,10 @@ struct edmacc_param { #define ITCCHEN BIT(23) /*ch_status paramater of callback function possible values*/ -#define DMA_COMPLETE 1 -#define DMA_CC_ERROR 2 -#define DMA_TC1_ERROR 3 -#define DMA_TC2_ERROR 4 +#define EDMA_DMA_COMPLETE 1 +#define EDMA_DMA_CC_ERROR 2 +#define EDMA_DMA_TC1_ERROR 3 +#define EDMA_DMA_TC2_ERROR 4 enum address_mode { INCR = 0, -- 1.7.0.4 -- ~Vinod
next prev parent reply other threads:[~2013-10-30 13:58 UTC|newest] Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-10-16 16:28 [PATCH 00/28]: dmaengine: use DMA_COMPLETE for dma completion status Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 01/28] " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 18:29 ` Guennadi Liakhovetski 2013-10-16 18:29 ` Guennadi Liakhovetski 2013-10-16 18:45 ` Dan Williams 2013-10-16 18:45 ` Dan Williams 2013-10-17 2:07 ` Vinod Koul 2013-10-17 2:07 ` Vinod Koul 2013-10-17 8:27 ` Guennadi Liakhovetski 2013-10-17 8:27 ` Guennadi Liakhovetski 2013-10-17 9:53 ` Vinod Koul 2013-10-17 9:53 ` Vinod Koul 2013-10-17 14:27 ` Sebastian Andrzej Siewior 2013-10-17 14:27 ` Sebastian Andrzej Siewior 2013-10-17 13:48 ` Vinod Koul 2013-10-17 13:48 ` Vinod Koul 2013-10-24 21:28 ` Guennadi Liakhovetski 2013-10-24 21:28 ` Guennadi Liakhovetski 2013-10-25 4:23 ` Vinod Koul 2013-10-25 4:23 ` Vinod Koul 2013-10-25 6:32 ` Guennadi Liakhovetski 2013-10-25 6:32 ` Guennadi Liakhovetski 2013-10-25 5:43 ` Vinod Koul 2013-10-25 5:43 ` Vinod Koul 2013-10-25 6:43 ` Guennadi Liakhovetski 2013-10-25 6:43 ` Guennadi Liakhovetski 2013-10-29 16:47 ` Olof Johansson 2013-10-29 16:47 ` Olof Johansson 2013-10-30 13:03 ` Vinod Koul [this message] 2013-10-30 13:03 ` Vinod Koul 2013-11-04 12:51 ` Sebastian Andrzej Siewior 2013-11-04 12:51 ` Sebastian Andrzej Siewior 2013-11-11 19:13 ` Olof Johansson 2013-11-11 19:13 ` Olof Johansson 2013-11-12 4:00 ` Vinod Koul 2013-11-12 4:00 ` Vinod Koul 2013-11-12 5:11 ` Olof Johansson 2013-11-12 5:11 ` Olof Johansson 2013-11-12 4:47 ` Vinod Koul 2013-11-12 4:47 ` Vinod Koul 2013-10-17 14:39 ` Guennadi Liakhovetski 2013-10-17 14:39 ` Guennadi Liakhovetski 2013-10-16 16:28 ` [PATCH 02/28] dmaengine: amba-pl08x: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 03/28] dmaengine: at_hdma: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-17 8:08 ` Nicolas Ferre 2013-10-17 8:08 ` Nicolas Ferre 2013-10-16 16:28 ` [PATCH 04/28] dmaengine: coh901318: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 05/28] dmaengine: cppi41: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 06/28] dmaengine: jz4740: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 07/28] dmaengine: dmatest: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 08/28] dmaengine: dw: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-17 13:43 ` Andy Shevchenko 2013-10-17 13:43 ` Andy Shevchenko 2013-10-21 7:33 ` Viresh Kumar 2013-10-21 7:33 ` Viresh Kumar 2013-10-16 16:28 ` [PATCH 09/28] dmaengine: edma: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-17 0:31 ` Joel Fernandes 2013-10-17 0:31 ` Joel Fernandes 2013-10-16 16:28 ` [PATCH 10/28] dmaengine: imx-dma: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 11/28] dmaengine: imx-sdma: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 12/28] dmaengine: intel_mid_dma: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 13/28] dmaengine: ioat: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 14/28] dmaengine: iop: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 15/28] dmaengine: k3dma: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-17 14:18 ` zhangfei gao 2013-10-17 14:18 ` zhangfei gao 2013-10-16 16:28 ` [PATCH 16/28] dmaengine: mmp_tdma: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-17 14:19 ` zhangfei gao 2013-10-17 14:19 ` zhangfei gao 2013-10-16 16:28 ` [PATCH 17/28] dmaengine: mv_xor: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 18/28] dmaengine: mxs-dma: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 19/28] dmaengine: omap: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 20/28] dmaengine: ppc4xx: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 21/28] dmaengine: sa11x0: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 22/28] dmaengine: sh: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 23/28] dmaengine: ste: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 24/28] dmaengine: tegra: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 25/28] dmaengine: txx9: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 26/28] async_tx: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 16:28 ` [PATCH 27/28] serial: sh: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-16 20:17 ` Greg Kroah-Hartman 2013-10-16 20:17 ` Greg Kroah-Hartman 2013-10-16 16:28 ` [PATCH 28/28] net: " Vinod Koul 2013-10-16 16:28 ` Vinod Koul 2013-10-17 2:16 ` [PATCH 29/29] dmaengine: remove unused DMA_SUCCESS Vinod Koul 2013-10-17 2:16 ` Vinod Koul 2013-10-17 4:55 ` [PATCH 28/28] net: use DMA_COMPLETE for dma completion status David Miller 2013-10-17 4:55 ` David Miller 2013-10-17 9:00 ` [PATCH 00/28]: dmaengine: " Linus Walleij 2013-10-17 9:00 ` Linus Walleij
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20131030130325.GA18788@intel.com \ --to=vinod.koul@intel.com \ --cc=dan.j.williams@intel.com \ --cc=g.liakhovetski@gmx.de \ --cc=joelf@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=matt.porter@linaro.org \ --cc=nsekhar@ti.com \ --cc=olof@lixom.net \ --cc=sebastian@breakpoint.cc \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.