media: atmel: atmel-isc: specialize driver name constant

The driver name constant must defined based on product driver, thus moving
the constant directly where it's required. This will allow each ISC based
product to define it's own name.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
index 46d384332a58172c6e7e2cde1f22a67e27038a0b..d987a8891bd9ec8d2467c066f51c5c2b54a36a04 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc-base.c
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
@@ -909,7 +909,7 @@ static int isc_querycap(struct file *file, void *priv,
 {
        struct isc_device *isc = video_drvdata(file);
 
-       strscpy(cap->driver, ATMEL_ISC_NAME, sizeof(cap->driver));
+       strscpy(cap->driver, "microchip-isc", sizeof(cap->driver));
        strscpy(cap->card, "Atmel Image Sensor Controller", sizeof(cap->card));
        snprintf(cap->bus_info, sizeof(cap->bus_info),
                 "platform:%s", isc->v4l2_dev.name);
@@ -2261,7 +2261,7 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier)
        }
 
        /* Register video device */
-       strscpy(vdev->name, ATMEL_ISC_NAME, sizeof(vdev->name));
+       strscpy(vdev->name, "microchip-isc", sizeof(vdev->name));
        vdev->release           = video_device_release_empty;
        vdev->fops              = &isc_fops;
        vdev->ioctl_ops         = &isc_ioctl_ops;

diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
index f1df47a4655bc49c61103dae393ec346af48fdd5..8d81d9967ad234464cd422a94363b34a521daa48 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc.h
+++ b/drivers/media/platform/atmel/atmel-isc.h
@@ -256,8 +256,6 @@ struct isc_device {
        u32             gamma_max;
 };
 
-#define ATMEL_ISC_NAME "atmel-isc"
-
 extern struct isc_format formats_list[];
 extern const struct isc_format controller_formats[];
 extern const struct regmap_config isc_regmap_config;

diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
index e7156169febe48945500d3979560cb721f20d151..7e94db04a796299f30e47db673b1e1609865a2c4 100644 (file)
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
@@ -185,7 +185,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
                return irq;
 
        ret = devm_request_irq(dev, irq, isc_interrupt, 0,
-                              ATMEL_ISC_NAME, isc);
+                              "atmel-sama5d2-isc", isc);
        if (ret < 0) {
                dev_err(dev, "can't register ISR for IRQ %u (ret=%i)\n",
                        irq, ret);
@@ -364,7 +364,7 @@ static struct platform_driver atmel_isc_driver = {
        .probe  = atmel_isc_probe,
        .remove = atmel_isc_remove,
        .driver = {
-               .name           = ATMEL_ISC_NAME,
+               .name           = "atmel-sama5d2-isc",
                .pm             = &atmel_isc_dev_pm_ops,
                .of_match_table = of_match_ptr(atmel_isc_of_match),
        },