| Message ID | 20190606094717.23766-1-anders.roxell@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fix warnings for same module names | expand |
On 6/6/19 11:47 AM, Anders Roxell wrote: > When building with CONFIG_VIDEO_ADV7511 and CONFIG_DRM_I2C_ADV7511 > enabled as loadable modules, we see the following warning: > > warning: same module names found: > drivers/gpu/drm/bridge/adv7511/adv7511.ko > drivers/media/i2c/adv7511.ko > > Rework so the names matches the config fragment. > > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Change it in media, not in drm. The v4l2 adv7511 is rarely used, so it makes sense to rename that, and not this drm driver. > --- > This is only one issue that have been addressed. > The other issue is that itseems to refer to the same device name in > i2c_device_id, any guidance how that should be solved? You should never have both modules loaded. In fact, I think it is a good idea to disable VIDEO_ADV7511 if DRM_I2C_ADV7511 is set in the Kconfig, unless TEST_COMPILE is also set. Regards, Hans > > > Cheers, > Anders > > drivers/gpu/drm/bridge/adv7511/Makefile | 10 +++++----- > drivers/media/i2c/Makefile | 3 ++- > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/adv7511/Makefile b/drivers/gpu/drm/bridge/adv7511/Makefile > index b46ebeb35fd4..e367426bd73e 100644 > --- a/drivers/gpu/drm/bridge/adv7511/Makefile > +++ b/drivers/gpu/drm/bridge/adv7511/Makefile > @@ -1,6 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0-only > -adv7511-y := adv7511_drv.o > -adv7511-$(CONFIG_DRM_I2C_ADV7511_AUDIO) += adv7511_audio.o > -adv7511-$(CONFIG_DRM_I2C_ADV7511_CEC) += adv7511_cec.o > -adv7511-$(CONFIG_DRM_I2C_ADV7533) += adv7533.o > -obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511.o > +drm-i2c-adv7511-y := adv7511_drv.o > +drm-i2c-adv7511-$(CONFIG_DRM_I2C_ADV7511_AUDIO) += adv7511_audio.o > +drm-i2c-adv7511-$(CONFIG_DRM_I2C_ADV7511_CEC) += adv7511_cec.o > +drm-i2c-adv7511-$(CONFIG_DRM_I2C_ADV7533) += adv7533.o > +obj-$(CONFIG_DRM_I2C_ADV7511) += drm-i2c-adv7511.o > diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile > index d8ad9dad495d..b71a427a89fd 100644 > --- a/drivers/media/i2c/Makefile > +++ b/drivers/media/i2c/Makefile > @@ -35,7 +35,8 @@ obj-$(CONFIG_VIDEO_ADV748X) += adv748x/ > obj-$(CONFIG_VIDEO_ADV7604) += adv7604.o > obj-$(CONFIG_VIDEO_ADV7842) += adv7842.o > obj-$(CONFIG_VIDEO_AD9389B) += ad9389b.o > -obj-$(CONFIG_VIDEO_ADV7511) += adv7511.o > +obj-$(CONFIG_VIDEO_ADV7511) += video-adv7511.o > +video-adv7511-objs := adv7511.o > obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o > obj-$(CONFIG_VIDEO_VS6624) += vs6624.o > obj-$(CONFIG_VIDEO_BT819) += bt819.o >
diff --git a/drivers/gpu/drm/bridge/adv7511/Makefile b/drivers/gpu/drm/bridge/adv7511/Makefile index b46ebeb35fd4..e367426bd73e 100644 --- a/drivers/gpu/drm/bridge/adv7511/Makefile +++ b/drivers/gpu/drm/bridge/adv7511/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only -adv7511-y := adv7511_drv.o -adv7511-$(CONFIG_DRM_I2C_ADV7511_AUDIO) += adv7511_audio.o -adv7511-$(CONFIG_DRM_I2C_ADV7511_CEC) += adv7511_cec.o -adv7511-$(CONFIG_DRM_I2C_ADV7533) += adv7533.o -obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511.o +drm-i2c-adv7511-y := adv7511_drv.o +drm-i2c-adv7511-$(CONFIG_DRM_I2C_ADV7511_AUDIO) += adv7511_audio.o +drm-i2c-adv7511-$(CONFIG_DRM_I2C_ADV7511_CEC) += adv7511_cec.o +drm-i2c-adv7511-$(CONFIG_DRM_I2C_ADV7533) += adv7533.o +obj-$(CONFIG_DRM_I2C_ADV7511) += drm-i2c-adv7511.o diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile index d8ad9dad495d..b71a427a89fd 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -35,7 +35,8 @@ obj-$(CONFIG_VIDEO_ADV748X) += adv748x/ obj-$(CONFIG_VIDEO_ADV7604) += adv7604.o obj-$(CONFIG_VIDEO_ADV7842) += adv7842.o obj-$(CONFIG_VIDEO_AD9389B) += ad9389b.o -obj-$(CONFIG_VIDEO_ADV7511) += adv7511.o +obj-$(CONFIG_VIDEO_ADV7511) += video-adv7511.o +video-adv7511-objs := adv7511.o obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o obj-$(CONFIG_VIDEO_VS6624) += vs6624.o obj-$(CONFIG_VIDEO_BT819) += bt819.o
When building with CONFIG_VIDEO_ADV7511 and CONFIG_DRM_I2C_ADV7511 enabled as loadable modules, we see the following warning: warning: same module names found: drivers/gpu/drm/bridge/adv7511/adv7511.ko drivers/media/i2c/adv7511.ko Rework so the names matches the config fragment. Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- This is only one issue that have been addressed. The other issue is that itseems to refer to the same device name in i2c_device_id, any guidance how that should be solved? Cheers, Anders drivers/gpu/drm/bridge/adv7511/Makefile | 10 +++++----- drivers/media/i2c/Makefile | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-)