drivers: media: coda: fix warning same module names

PATCH Superseded Anders Roxell 2 participants 2 messages Jun 12, 2019 Media (V4L/DVB)

lore

Share & tools

lore

Anders Roxell

author

2019-06-12 08:15 UTC #0 lore raw

PATCH v2 3/3 drivers: media: coda: fix warning same module names

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/platform/coda is named coda-vpu. Leaving CODA_FS as is since that's a well known module.

Signed-off-by Anders Roxell <[email protected]>

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

drivers/media/platform/coda/Makefile +2 -2

index 54e9a73a92ab..5fd5efa35159 100644
@@ -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
+coda-vpu-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) += coda-vpu.o
 obj-$(CONFIG_VIDEO_IMX_VDOA) += imx-vdoa.o

Signature · 1 line

2.20.1

Philipp Zabel

Reviewed-by on v2 3/3

2019-06-12 08:27 UTC #1 lore raw

Quoted 20 lines · Anders Roxell

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/platform/coda is named coda-vpu. Leaving CODA_FS as is since that's a well known module.
Signed-off-by Anders Roxell <[email protected]>
---
 drivers/media/platform/coda/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/coda/Makefile +0 -0
index 54e9a73a92ab..5fd5efa35159 100644

drivers/media/platform/coda/Makefile line 5

Quoted 7 lines

drivers/media/platform/coda/Makefile +2 -2

@@ -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
+coda-vpu-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) += coda-vpu.o

Thanks,

Reviewed-by Philipp Zabel <[email protected]>

regards
Philipp