Skip to contentSkip to conversation

drivers: (video|gpu): fix warning same module names

PATCH In review Anders Roxell 3 participants 3 messages Jun 6, 2019 – Jun 7, 2019

Subsystems (8)
lore
Share & tools
lore
#0 lore raw

PATCH 3/8 drivers: (video|gpu): fix warning same module names

When building with CONFIG_DRM_MXSFB and CONFIG_FB_MXS enabled as loadable modules, we see the following warning:

warning: same module names found:
drivers/video/fbdev/mxsfb.ko
drivers/gpu/drm/mxsfb/mxsfb.ko

Rework so the names matches the config fragment.

---
 drivers/gpu/drm/mxsfb/Makefile | 4 ++--
 drivers/video/fbdev/Makefile   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/mxsfb/Makefile +2 -2
index ff6e358088fa..5d49d7548e66 100644
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
-mxsfb-y := mxsfb_drv.o mxsfb_crtc.o mxsfb_out.o
-obj-$(CONFIG_DRM_MXSFB)	+= mxsfb.o
+drm-mxsfb-y := mxsfb_drv.o mxsfb_crtc.o mxsfb_out.o
+obj-$(CONFIG_DRM_MXSFB)	+= drm-mxsfb.o
drivers/video/fbdev/Makefile +2 -1
index 655f2537cac1..7ee967525af2 100644
@@ -131,7 +131,8 @@ obj-$(CONFIG_FB_VGA16)            += vga16fb.o
 obj-$(CONFIG_FB_OF)               += offb.o
 obj-$(CONFIG_FB_MX3)		  += mx3fb.o
 obj-$(CONFIG_FB_DA8XX)		  += da8xx-fb.o
-obj-$(CONFIG_FB_MXS)		  += mxsfb.o
+obj-$(CONFIG_FB_MXS)		  += fb-mxs.o
+fb-mxs-objs			  := mxsfb.o
 obj-$(CONFIG_FB_SSD1307)	  += ssd1307fb.o
 obj-$(CONFIG_FB_SIMPLE)           += simplefb.o
 
Signature · 1 line
2.20.1
Reviewed-by on v1 3/8
#1 lore raw
Quoted 10 lines · Anders Roxell

When building with CONFIG_DRM_MXSFB and CONFIG_FB_MXS enabled as loadable modules, we see the following warning:

warning: same module names found:
drivers/video/fbdev/mxsfb.ko
drivers/gpu/drm/mxsfb/mxsfb.ko

Rework so the names matches the config fragment.

I'm assuming Bart will pick this one up for fbdev. -Daniel

Quoted 32 lines
---
 drivers/gpu/drm/mxsfb/Makefile | 4 ++--
 drivers/video/fbdev/Makefile   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/mxsfb/Makefile +2 -2
index ff6e358088fa..5d49d7548e66 100644
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
-mxsfb-y := mxsfb_drv.o mxsfb_crtc.o mxsfb_out.o
-obj-$(CONFIG_DRM_MXSFB)	+= mxsfb.o
+drm-mxsfb-y := mxsfb_drv.o mxsfb_crtc.o mxsfb_out.o
+obj-$(CONFIG_DRM_MXSFB)	+= drm-mxsfb.o
drivers/video/fbdev/Makefile +2 -1
index 655f2537cac1..7ee967525af2 100644
@@ -131,7 +131,8 @@ obj-$(CONFIG_FB_VGA16)            += vga16fb.o
 obj-$(CONFIG_FB_OF)               += offb.o
 obj-$(CONFIG_FB_MX3)		  += mx3fb.o
 obj-$(CONFIG_FB_DA8XX)		  += da8xx-fb.o
-obj-$(CONFIG_FB_MXS)		  += mxsfb.o
+obj-$(CONFIG_FB_MXS)		  += fb-mxs.o
+fb-mxs-objs			  := mxsfb.o
 obj-$(CONFIG_FB_SSD1307)	  += ssd1307fb.o
 obj-$(CONFIG_FB_SIMPLE)           += simplefb.o
 
Signature · 1 line
2.20.1
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
#2 lore raw
Quoted 8 lines · Daniel Vetter
Quoted 7 lines · Anders Roxell

When building with CONFIG_DRM_MXSFB and CONFIG_FB_MXS enabled as loadable modules, we see the following warning:

warning: same module names found:
drivers/video/fbdev/mxsfb.ko
drivers/gpu/drm/mxsfb/mxsfb.ko

Quoted 7 lines
Quoted 3 lines

Rework so the names matches the config fragment.

I'm assuming Bart will pick this one up for fbdev.

The DRM mxsfb has been a default for almost a year (since July 2018) and I've just applied "[PATCH] video: fbdev: mxsfb: Remove driver" (https://marc.info/?l=dri-devel&m=155835758115686&w=2)
so it seems that this patch is not needed any longer (sorry!).

Quoted 31 lines

-Daniel

Quoted 29 lines
---
 drivers/gpu/drm/mxsfb/Makefile | 4 ++--
 drivers/video/fbdev/Makefile   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/mxsfb/Makefile +2 -2
index ff6e358088fa..5d49d7548e66 100644
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
-mxsfb-y := mxsfb_drv.o mxsfb_crtc.o mxsfb_out.o
-obj-$(CONFIG_DRM_MXSFB)	+= mxsfb.o
+drm-mxsfb-y := mxsfb_drv.o mxsfb_crtc.o mxsfb_out.o
+obj-$(CONFIG_DRM_MXSFB)	+= drm-mxsfb.o
drivers/video/fbdev/Makefile +2 -1
index 655f2537cac1..7ee967525af2 100644
@@ -131,7 +131,8 @@ obj-$(CONFIG_FB_VGA16)            += vga16fb.o
 obj-$(CONFIG_FB_OF)               += offb.o
 obj-$(CONFIG_FB_MX3)		  += mx3fb.o
 obj-$(CONFIG_FB_DA8XX)		  += da8xx-fb.o
-obj-$(CONFIG_FB_MXS)		  += mxsfb.o
+obj-$(CONFIG_FB_MXS)		  += fb-mxs.o
+fb-mxs-objs			  := mxsfb.o
 obj-$(CONFIG_FB_SSD1307)	  += ssd1307fb.o
 obj-$(CONFIG_FB_SIMPLE)           += simplefb.o
 
Quoted 2 lines
Quoted 2 lines
Signature · 1 line
2.20.1

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics