media: adv7511/cobalt: rename driver name to adv7511-v4l2

Commit b2ce5617dad2 ("media: i2c: fix warning same module names")
renamed the adv7511 module in the media tree to adv7511-v4l2.

This patch does the same rename for the driver name and device id to
keep the naming consistent.

Since the cobalt driver loads this module, it had to be renamed there
as well.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/i2c/adv7511-v4l2.c b/drivers/media/i2c/adv7511-v4l2.c
index 2ad6bdf..45cc5a4 100644 (file)
--- a/drivers/media/i2c/adv7511-v4l2.c
+++ b/drivers/media/i2c/adv7511-v4l2.c
@@ -1980,14 +1980,14 @@ static int adv7511_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id adv7511_id[] = {
-       { "adv7511", 0 },
+       { "adv7511-v4l2", 0 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, adv7511_id);
 
 static struct i2c_driver adv7511_driver = {
        .driver = {
-               .name = "adv7511",
+               .name = "adv7511-v4l2",
        },
        .probe = adv7511_probe,
        .remove = adv7511_remove,

diff --git a/drivers/media/pci/cobalt/cobalt-driver.c b/drivers/media/pci/cobalt/cobalt-driver.c
index b92833f..0695078 100644 (file)
--- a/drivers/media/pci/cobalt/cobalt-driver.c
+++ b/drivers/media/pci/cobalt/cobalt-driver.c
@@ -584,7 +584,7 @@ static int cobalt_subdevs_hsma_init(struct cobalt *cobalt)
                .cec_clk = 12000000,
        };
        static struct i2c_board_info adv7511_info = {
-               .type = "adv7511",
+               .type = "adv7511-v4l2",
                .addr = 0x39, /* 0x39 or 0x3d */
                .platform_data = &adv7511_pdata,
        };