target/linux/at91/patches-5.15/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 --- a/drivers/media/platform/atmel/atmel-isc-base.c
  21 +++ b/drivers/media/platform/atmel/atmel-isc-base.c
  22 @@ -909,7 +909,7 @@ static int isc_querycap(struct file *fil
  23  {
  24         struct isc_device *isc = video_drvdata(file);
  25
  26 -       strscpy(cap->driver, ATMEL_ISC_NAME, sizeof(cap->driver));
  27 +       strscpy(cap->driver, "microchip-isc", sizeof(cap->driver));
  28         strscpy(cap->card, "Atmel Image Sensor Controller", sizeof(cap->card));
  29         snprintf(cap->bus_info, sizeof(cap->bus_info),
  30                  "platform:%s", isc->v4l2_dev.name);
  31 @@ -2261,7 +2261,7 @@ static int isc_async_complete(struct v4l
  32         }
  33
  34         /* Register video device */
  35 -       strscpy(vdev->name, ATMEL_ISC_NAME, sizeof(vdev->name));
  36 +       strscpy(vdev->name, "microchip-isc", sizeof(vdev->name));
  37         vdev->release           = video_device_release_empty;
  38         vdev->fops              = &isc_fops;
  39         vdev->ioctl_ops         = &isc_ioctl_ops;
  40 --- a/drivers/media/platform/atmel/atmel-isc.h
  41 +++ b/drivers/media/platform/atmel/atmel-isc.h
  42 @@ -255,8 +255,6 @@ struct isc_device {
  43         u32             gamma_max;
  44  };
  45
  46 -#define ATMEL_ISC_NAME "atmel-isc"
  47 -
  48  extern struct isc_format formats_list[];
  49  extern const struct isc_format controller_formats[];
  50  extern const struct regmap_config isc_regmap_config;
  51 --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  52 +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  53 @@ -206,7 +206,7 @@ static int atmel_isc_probe(struct platfo
  54                 return irq;
  55
  56         ret = devm_request_irq(dev, irq, isc_interrupt, 0,
  57 -                              ATMEL_ISC_NAME, isc);
  58 +                              "atmel-sama5d2-isc", isc);
  59         if (ret < 0) {
  60                 dev_err(dev, "can't register ISR for IRQ %u (ret=%i)\n",
  61                         irq, ret);
  62 @@ -378,7 +378,7 @@ static struct platform_driver atmel_isc_
  63         .probe  = atmel_isc_probe,
  64         .remove = atmel_isc_remove,
  65         .driver = {
  66 -               .name           = ATMEL_ISC_NAME,
  67 +               .name           = "atmel-sama5d2-isc",
  68                 .pm             = &atmel_isc_dev_pm_ops,
  69                 .of_match_table = of_match_ptr(atmel_isc_of_match),
  70         },