On Mon, Feb 08, 2021 at 07:20:06PM +0100, Jacopo Mondi wrote:
> With the introduction of the RDACM21 camera module support in
> commit a59f853b3b4b ("media: i2c: Add driver for RDACM21 camera module")
> the symbols defined by the max9271 library were exported twice
> if multiple users of the library were compiled in at the same time.
>
> In example:
> WARNING: modpost: drivers/media/i2c/rdacm21-camera_module:
> 'max9271_set_serial_link' exported twice. Previous export was in
> drivers/media/i2c/rdacm20-camera_module.ko
>
> Fix this by making the rdacm21 file a module and have the driver
> using its functions select it.
>
> Fixes: a59f853b3b4b ("media: i2c: Add driver for RDACM21 camera module")
> Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Suggested-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
> Signed-off-by: Jacopo Mondi <jacopo+renesas@xxxxxxxxxx>
That file needs a MODULE_LICENSE now otherwise there will be a fatal
build error:
ERROR: modpost: missing MODULE_LICENSE() in drivers/media/i2c/max9271.o
Cheers,
Nathan
> ---
> drivers/media/i2c/Kconfig | 5 +++++
> drivers/media/i2c/Makefile | 7 +++----
> 2 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
> index 2d3dc0d82f9e..84645f751da3 100644
> --- a/drivers/media/i2c/Kconfig
> +++ b/drivers/media/i2c/Kconfig
> @@ -1240,12 +1240,16 @@ config VIDEO_NOON010PC30
>
> source "drivers/media/i2c/m5mols/Kconfig"
>
> +config VIDEO_MAX9271
> + tristate
> +
> config VIDEO_RDACM20
> tristate "IMI RDACM20 camera support"
> depends on I2C
> select V4L2_FWNODE
> select VIDEO_V4L2_SUBDEV_API
> select MEDIA_CONTROLLER
> + select VIDEO_MAX9271
> help
> This driver supports the IMI RDACM20 GMSL camera, used in
> ADAS systems.
> @@ -1259,6 +1263,7 @@ config VIDEO_RDACM21
> select V4L2_FWNODE
> select VIDEO_V4L2_SUBDEV_API
> select MEDIA_CONTROLLER
> + select VIDEO_MAX9271
> help
> This driver supports the IMI RDACM21 GMSL camera, used in
> ADAS systems.
> diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
> index 6bd22d63e1a7..c34a7de3158b 100644
> --- a/drivers/media/i2c/Makefile
> +++ b/drivers/media/i2c/Makefile
> @@ -125,10 +125,9 @@ obj-$(CONFIG_VIDEO_IMX319) += imx319.o
> obj-$(CONFIG_VIDEO_IMX334) += imx334.o
> obj-$(CONFIG_VIDEO_IMX355) += imx355.o
> obj-$(CONFIG_VIDEO_MAX9286) += max9286.o
> -rdacm20-camera_module-objs := rdacm20.o max9271.o
> -obj-$(CONFIG_VIDEO_RDACM20) += rdacm20-camera_module.o
> -rdacm21-camera_module-objs := rdacm21.o max9271.o
> -obj-$(CONFIG_VIDEO_RDACM21) += rdacm21-camera_module.o
> +obj-$(CONFIG_VIDEO_MAX9271) += max9271.o
> +obj-$(CONFIG_VIDEO_RDACM20) += rdacm20.o
> +obj-$(CONFIG_VIDEO_RDACM21) += rdacm21.o
> obj-$(CONFIG_VIDEO_ST_MIPID02) += st-mipid02.o
>
> obj-$(CONFIG_SDR_MAX2175) += max2175.o
> --
> 2.30.0
>
