2017-12-12 07:28:57

by Venkat Prashanth B U

[permalink] [raw]
Subject: [PATCH v1] DMA:omap-dma:Avoid build error by changing the function name

From: Venkat Prashanth B U <[email protected]>

Change the name of the function omap_dma_filter_fn to avoid
the following build error in linux kernel version 4.4 :

drivers/dma/dma-omap.c:1273:6: error:
redefinition of 'omap_dma_filter_fn'

Signed-off-by: Venkat Prashanth B U <[email protected]>
Changes for v1:
- Edited subject and description of the patch to fit with the change
done in the code base, as suggested by Vinod Koul.

- In order to avoid issues like backporting on stable the
checkpatch.pl issues are dropped as suggested by Vinod Koul.
---
drivers/dma/omap-dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
index 1dfc71c..8545dda 100644
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -1269,7 +1269,7 @@ static struct platform_driver omap_dma_driver = {
},
};

-bool omap_dma_filter_fn(struct dma_chan *chan, void *param)
+bool omap_dma_filter_func(struct dma_chan *chan, void *param)
{
if (chan->device->dev->driver == &omap_dma_driver.driver) {
struct omap_dmadev *od = to_omap_dma_dev(chan->device);
--
1.9.1


2017-12-18 05:25:36

by Vinod Koul

[permalink] [raw]
Subject: Re: [PATCH v1] DMA:omap-dma:Avoid build error by changing the function name

On Tue, Dec 12, 2017 at 12:58:41PM +0530, [email protected] wrote:
> From: Venkat Prashanth B U <[email protected]>
>
> Change the name of the function omap_dma_filter_fn to avoid
> the following build error in linux kernel version 4.4 :
>
> drivers/dma/dma-omap.c:1273:6: error:
> redefinition of 'omap_dma_filter_fn'

Okay I do not see this error, which tree are you running?

In code is see omap_dma_filter_fn is used everywhere and no reference to
omap_dma_filter_func

Adding peter too..


>
> Signed-off-by: Venkat Prashanth B U <[email protected]>
> Changes for v1:
> - Edited subject and description of the patch to fit with the change
> done in the code base, as suggested by Vinod Koul.
>
> - In order to avoid issues like backporting on stable the
> checkpatch.pl issues are dropped as suggested by Vinod Koul.
> ---
> drivers/dma/omap-dma.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
> index 1dfc71c..8545dda 100644
> --- a/drivers/dma/omap-dma.c
> +++ b/drivers/dma/omap-dma.c
> @@ -1269,7 +1269,7 @@ static struct platform_driver omap_dma_driver = {
> },
> };
>
> -bool omap_dma_filter_fn(struct dma_chan *chan, void *param)
> +bool omap_dma_filter_func(struct dma_chan *chan, void *param)
> {
> if (chan->device->dev->driver == &omap_dma_driver.driver) {
> struct omap_dmadev *od = to_omap_dma_dev(chan->device);
> --
> 1.9.1
> --
> To unsubscribe from this list: send the line "unsubscribe dmaengine" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

--
~Vinod

2017-12-18 07:52:36

by Peter Ujfalusi

[permalink] [raw]
Subject: Re: [PATCH v1] DMA:omap-dma:Avoid build error by changing the function name



On 2017-12-18 07:29, Vinod Koul wrote:
> On Tue, Dec 12, 2017 at 12:58:41PM +0530, [email protected] wrote:
>> From: Venkat Prashanth B U <[email protected]>
>>
>> Change the name of the function omap_dma_filter_fn to avoid
>> the following build error in linux kernel version 4.4 :
>>
>> drivers/dma/dma-omap.c:1273:6: error:
>> redefinition of 'omap_dma_filter_fn'

What is your config regarding to omap_dma?

in the include/linux/omap-dmaengine.h :

#if defined(CONFIG_DMA_OMAP) || (defined(CONFIG_DMA_OMAP_MODULE) &&
defined(MODULE))
bool omap_dma_filter_fn(struct dma_chan *, void *);
#else
static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d)
{
return false;
}
#endif

DMA_OMAP enables the build of drivers/dma/omap-dma.c

>
> Okay I do not see this error, which tree are you running?

I have not seen this either, and looking at the code I don't think it is
possible. Not with what we have upstream.

> In code is see omap_dma_filter_fn is used everywhere and no reference to
> omap_dma_filter_func
>
> Adding peter too..
>
>
>>
>> Signed-off-by: Venkat Prashanth B U <[email protected]>
>> Changes for v1:
>> - Edited subject and description of the patch to fit with the change
>> done in the code base, as suggested by Vinod Koul.
>>
>> - In order to avoid issues like backporting on stable the
>> checkpatch.pl issues are dropped as suggested by Vinod Koul.
>> ---
>> drivers/dma/omap-dma.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
>> index 1dfc71c..8545dda 100644
>> --- a/drivers/dma/omap-dma.c
>> +++ b/drivers/dma/omap-dma.c
>> @@ -1269,7 +1269,7 @@ static struct platform_driver omap_dma_driver = {
>> },
>> };
>>
>> -bool omap_dma_filter_fn(struct dma_chan *chan, void *param)
>> +bool omap_dma_filter_func(struct dma_chan *chan, void *param)

this certainly breaks the omap_dma driver on non DT booted systems.

>> {
>> if (chan->device->dev->driver == &omap_dma_driver.driver) {
>> struct omap_dmadev *od = to_omap_dma_dev(chan->device);
>> --
>> 1.9.1
>> --
>> To unsubscribe from this list: send the line "unsubscribe dmaengine" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>

- Péter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki