[5/8] drivers: media: coda: fix warning same module names

Message ID 20190606094722.23816-1-anders.roxell@linaro.org
State New
Headers show
Series
  • Untitled series #20885
Related show

Commit Message

Anders Roxell June 6, 2019, 9:47 a.m.
When building with CONFIG_VIDEO_CODA and CONFIG_CODA_FS enabled as
loadable modules, we see the following warning:

warning: same module names found:
  fs/coda/coda.ko
  drivers/media/platform/coda/coda.ko

Rework so media coda matches the config fragment. Leaving CODA_FS as is
since thats a well known module.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

---
 drivers/media/platform/coda/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.20.1

Comments

Anders Roxell June 10, 2019, 1:03 p.m. | #1
On Thu, 6 Jun 2019 at 12:13, Hans Verkuil <hverkuil@xs4all.nl> wrote:
>

> On 6/6/19 11:47 AM, Anders Roxell wrote:

> > When building with CONFIG_VIDEO_CODA and CONFIG_CODA_FS enabled as

> > loadable modules, we see the following warning:

> >

> > warning: same module names found:

> >   fs/coda/coda.ko

> >   drivers/media/platform/coda/coda.ko

> >

> > Rework so media coda matches the config fragment. Leaving CODA_FS as is

> > since thats a well known module.

> >

> > Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

> > ---

> >  drivers/media/platform/coda/Makefile | 4 ++--

> >  1 file changed, 2 insertions(+), 2 deletions(-)

> >

> > diff --git a/drivers/media/platform/coda/Makefile b/drivers/media/platform/coda/Makefile

> > index 54e9a73a92ab..588e6bf7c190 100644

> > --- a/drivers/media/platform/coda/Makefile

> > +++ b/drivers/media/platform/coda/Makefile

> > @@ -1,6 +1,6 @@

> >  # SPDX-License-Identifier: GPL-2.0-only

> >

> > -coda-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-mpeg2.o coda-mpeg4.o coda-jpeg.o

> > +video-coda-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-mpeg2.o coda-mpeg4.o coda-jpeg.o

> >

> > -obj-$(CONFIG_VIDEO_CODA) += coda.o

> > +obj-$(CONFIG_VIDEO_CODA) += video-coda.o

>

> How about imx-coda? video-coda suggests it is part of the video subsystem,

> which it isn't.


I'll resend a v2 shortly with imx-coda instead.


Cheers,
Anders

>

> Regards,

>

>         Hans

>

> >  obj-$(CONFIG_VIDEO_IMX_VDOA) += imx-vdoa.o

> >

>
Hans Verkuil June 11, 2019, 8:21 a.m. | #2
On 6/11/19 10:15 AM, Philipp Zabel wrote:
> Hi,

> 

> On Mon, 2019-06-10 at 13:14 +0000, Matt Redfearn wrote:

>>

>> On 10/06/2019 14:03, Anders Roxell wrote:

>>> On Thu, 6 Jun 2019 at 12:13, Hans Verkuil <hverkuil@xs4all.nl> wrote:

>>>>

>>>> On 6/6/19 11:47 AM, Anders Roxell wrote:

>>>>> When building with CONFIG_VIDEO_CODA and CONFIG_CODA_FS enabled as

>>>>> loadable modules, we see the following warning:

>>>>>

>>>>> warning: same module names found:

>>>>>    fs/coda/coda.ko

>>>>>    drivers/media/platform/coda/coda.ko

>>>>>

>>>>> Rework so media coda matches the config fragment. Leaving CODA_FS as is

>>>>> since thats a well known module.

>>>>>

>>>>> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

>>>>> ---

>>>>>   drivers/media/platform/coda/Makefile | 4 ++--

>>>>>   1 file changed, 2 insertions(+), 2 deletions(-)

>>>>>

>>>>> diff --git a/drivers/media/platform/coda/Makefile b/drivers/media/platform/coda/Makefile

>>>>> index 54e9a73a92ab..588e6bf7c190 100644

>>>>> --- a/drivers/media/platform/coda/Makefile

>>>>> +++ b/drivers/media/platform/coda/Makefile

>>>>> @@ -1,6 +1,6 @@

>>>>>   # SPDX-License-Identifier: GPL-2.0-only

>>>>>

>>>>> -coda-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-mpeg2.o coda-mpeg4.o coda-jpeg.o

>>>>> +video-coda-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-mpeg2.o coda-mpeg4.o coda-jpeg.o

>>>>>

>>>>> -obj-$(CONFIG_VIDEO_CODA) += coda.o

>>>>> +obj-$(CONFIG_VIDEO_CODA) += video-coda.o

>>>>

>>>> How about imx-coda? video-coda suggests it is part of the video subsystem,

>>>> which it isn't.

>>>

>>> I'll resend a v2 shortly with imx-coda instead.

> 

> I'd be in favor of calling it "coda-vpu" instead.


Fine by me!

> 

>> What about other vendor SoCs implementing the Coda IP block which are 

>> not an imx? I'd prefer a more generic name - maybe media-coda.

> 

> Right, this driver can be used on other SoCs [1].


Good point.

Regards,

	Hans

> 

> [1] https://www.mail-archive.com/linux-media@vger.kernel.org/msg146498.html

> 

> regards

> Philipp

>

Patch

diff --git a/drivers/media/platform/coda/Makefile b/drivers/media/platform/coda/Makefile
index 54e9a73a92ab..588e6bf7c190 100644
--- a/drivers/media/platform/coda/Makefile
+++ b/drivers/media/platform/coda/Makefile
@@ -1,6 +1,6 @@ 
 # SPDX-License-Identifier: GPL-2.0-only
 
-coda-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-mpeg2.o coda-mpeg4.o coda-jpeg.o
+video-coda-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-mpeg2.o coda-mpeg4.o coda-jpeg.o
 
-obj-$(CONFIG_VIDEO_CODA) += coda.o
+obj-$(CONFIG_VIDEO_CODA) += video-coda.o
 obj-$(CONFIG_VIDEO_IMX_VDOA) += imx-vdoa.o