diff options
Diffstat (limited to 'target/linux/at91/patches-5.10/158-media-atmel-atmel-isc-specialize-driver-name-constan.patch')
| -rw-r--r-- | target/linux/at91/patches-5.10/158-media-atmel-atmel-isc-specialize-driver-name-constan.patch | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/target/linux/at91/patches-5.10/158-media-atmel-atmel-isc-specialize-driver-name-constan.patch b/target/linux/at91/patches-5.10/158-media-atmel-atmel-isc-specialize-driver-name-constan.patch new file mode 100644 index 0000000000..b27552caa5 --- /dev/null +++ b/target/linux/at91/patches-5.10/158-media-atmel-atmel-isc-specialize-driver-name-constan.patch @@ -0,0 +1,79 @@ +From 0576e163d93d08a1ed112bd23f40478ef3fd323d Mon Sep 17 00:00:00 2001 +From: Eugen Hristev <eugen.hristev@microchip.com> +Date: Tue, 13 Apr 2021 12:57:00 +0200 +Subject: [PATCH 158/247] 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> +--- + drivers/media/platform/atmel/atmel-isc-base.c | 4 ++-- + drivers/media/platform/atmel/atmel-isc.h | 2 -- + drivers/media/platform/atmel/atmel-sama5d2-isc.c | 4 ++-- + 3 files changed, 4 insertions(+), 6 deletions(-) + +diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c +index 46d384332a58..d987a8891bd9 100644 +--- 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 a85b99274e34..bb43d3a93052 100644 +--- a/drivers/media/platform/atmel/atmel-isc.h ++++ b/drivers/media/platform/atmel/atmel-isc.h +@@ -255,8 +255,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 1b537cd1e09e..cba6e6c8810b 100644 +--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c ++++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c +@@ -206,7 +206,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); +@@ -378,7 +378,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), + }, +-- +2.32.0 + |