lkml.org 
[lkml]   [2019]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 093/158] media: i2c: fix warning same module names
    Date
    From: Anders Roxell <anders.roxell@linaro.org>

    [ Upstream commit b2ce5617dad254230551feda3599f2cc68e53ad8 ]

    When building with CONFIG_VIDEO_ADV7511 and CONFIG_DRM_I2C_ADV7511
    enabled as loadable modules, we see the following warning:

    drivers/gpu/drm/bridge/adv7511/adv7511.ko
    drivers/media/i2c/adv7511.ko

    Rework so that the file is named adv7511-v4l2.c.

    Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/i2c/Makefile | 2 +-
    drivers/media/i2c/{adv7511.c => adv7511-v4l2.c} | 5 +++++
    2 files changed, 6 insertions(+), 1 deletion(-)
    rename drivers/media/i2c/{adv7511.c => adv7511-v4l2.c} (99%)

    diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
    index a94eb03d10d4..520b3c3bf48c 100644
    --- a/drivers/media/i2c/Makefile
    +++ b/drivers/media/i2c/Makefile
    @@ -36,7 +36,7 @@ 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) += adv7511-v4l2.o
    obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o
    obj-$(CONFIG_VIDEO_VS6624) += vs6624.o
    obj-$(CONFIG_VIDEO_BT819) += bt819.o
    diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511-v4l2.c
    similarity index 99%
    rename from drivers/media/i2c/adv7511.c
    rename to drivers/media/i2c/adv7511-v4l2.c
    index 88349b5053cc..6869bb593a68 100644
    --- a/drivers/media/i2c/adv7511.c
    +++ b/drivers/media/i2c/adv7511-v4l2.c
    @@ -5,6 +5,11 @@
    * Copyright 2013 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
    */

    +/*
    + * This file is named adv7511-v4l2.c so it doesn't conflict with the Analog
    + * Device ADV7511 (config fragment CONFIG_DRM_I2C_ADV7511).
    + */
    +

    #include <linux/kernel.h>
    #include <linux/module.h>
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-07-15 17:45    [W:6.728 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site