target/linux/at91/patches-5.10/158-media-atmel-atmel-isc-specialize-driver-name-constan.patch

   1 From 0576e163d93d08a1ed112bd23f40478ef3fd323d Mon Sep 17 00:00:00 2001
   2 From: Eugen Hristev <eugen.hristev@microchip.com>
   3 Date: Tue, 13 Apr 2021 12:57:00 +0200
   4 Subject: [PATCH 158/247] media: atmel: atmel-isc: specialize driver name
   5  constant
   6
   7 The driver name constant must defined based on product driver, thus moving
   8 the constant directly where it's required. This will allow each ISC based
   9 product to define it's own name.
  10
  11 Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
  12 Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  13 Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  14 ---
  15  drivers/media/platform/atmel/atmel-isc-base.c    | 4 ++--
  16  drivers/media/platform/atmel/atmel-isc.h         | 2 --
  17  drivers/media/platform/atmel/atmel-sama5d2-isc.c | 4 ++--
  18  3 files changed, 4 insertions(+), 6 deletions(-)
  19
  20 diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
  21 index 46d384332a58..d987a8891bd9 100644
  22 --- a/drivers/media/platform/atmel/atmel-isc-base.c
  23 +++ b/drivers/media/platform/atmel/atmel-isc-base.c
  24 @@ -909,7 +909,7 @@ static int isc_querycap(struct file *file, void *priv,
  25  {
  26         struct isc_device *isc = video_drvdata(file);
  27
  28 -       strscpy(cap->driver, ATMEL_ISC_NAME, sizeof(cap->driver));
  29 +       strscpy(cap->driver, "microchip-isc", sizeof(cap->driver));
  30         strscpy(cap->card, "Atmel Image Sensor Controller", sizeof(cap->card));
  31         snprintf(cap->bus_info, sizeof(cap->bus_info),
  32                  "platform:%s", isc->v4l2_dev.name);
  33 @@ -2261,7 +2261,7 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier)
  34         }
  35
  36         /* Register video device */
  37 -       strscpy(vdev->name, ATMEL_ISC_NAME, sizeof(vdev->name));
  38 +       strscpy(vdev->name, "microchip-isc", sizeof(vdev->name));
  39         vdev->release           = video_device_release_empty;
  40         vdev->fops              = &isc_fops;
  41         vdev->ioctl_ops         = &isc_ioctl_ops;
  42 diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
  43 index a85b99274e34..bb43d3a93052 100644
  44 --- a/drivers/media/platform/atmel/atmel-isc.h
  45 +++ b/drivers/media/platform/atmel/atmel-isc.h
  46 @@ -255,8 +255,6 @@ struct isc_device {
  47         u32             gamma_max;
  48  };
  49
  50 -#define ATMEL_ISC_NAME "atmel-isc"
  51 -
  52  extern struct isc_format formats_list[];
  53  extern const struct isc_format controller_formats[];
  54  extern const struct regmap_config isc_regmap_config;
  55 diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  56 index 1b537cd1e09e..cba6e6c8810b 100644
  57 --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  58 +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  59 @@ -206,7 +206,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
  60                 return irq;
  61
  62         ret = devm_request_irq(dev, irq, isc_interrupt, 0,
  63 -                              ATMEL_ISC_NAME, isc);
  64 +                              "atmel-sama5d2-isc", isc);
  65         if (ret < 0) {
  66                 dev_err(dev, "can't register ISR for IRQ %u (ret=%i)\n",
  67                         irq, ret);
  68 @@ -378,7 +378,7 @@ static struct platform_driver atmel_isc_driver = {
  69         .probe  = atmel_isc_probe,
  70         .remove = atmel_isc_remove,
  71         .driver = {
  72 -               .name           = ATMEL_ISC_NAME,
  73 +               .name           = "atmel-sama5d2-isc",
  74                 .pm             = &atmel_isc_dev_pm_ops,
  75                 .of_match_table = of_match_ptr(atmel_isc_of_match),
  76         },
  77 --
  78 2.32.0
  79