From mboxrd@z Thu Jan 1 00:00:00 1970 From: vinod.koul@intel.com (Vinod Koul) Date: Tue, 12 Nov 2013 09:30:39 +0530 Subject: [PATCH 01/28] dmaengine: use DMA_COMPLETE for dma completion status In-Reply-To: <20131111191339.GA10328@quad.lixom.net> References: <20131017142755.GA4477@breakpoint.cc> <20131017134846.GG14013@intel.com> <20131025042310.GC21230@intel.com> <20131025054321.GD21230@intel.com> <20131030130325.GA18788@intel.com> <20131111191339.GA10328@quad.lixom.net> Message-ID: <20131112040039.GE8834@intel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Nov 11, 2013 at 11:13:39AM -0800, Olof Johansson wrote: > On Wed, Oct 30, 2013 at 06:33:25PM +0530, Vinod Koul wrote: > > 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 > > 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 > > Signed-off-by: Vinod Koul > > Thanks, I've applied this to fixes together with the follow-up from > Sebastian. Cc:ing Mark since it touches drivers/soc. I had applied this a while back and pushed only thing remaining was Sebastian's patch. Since this is dependent on the series I am sending to Linus in a day ro two, would prefer things to go thru this tree only. Let me know if you are okay and will apply Sebastian fix on my next -- ~Vinod