| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20241125-uvc-subdev-v4-6-51e040599f1a@chromium.org>
Date: Mon, 25 Nov 2024 19:49:11 +0000
From: Ricardo Ribalda <ribalda@...omium.org>
To: Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Sakari Ailus <sakari.ailus@...ux.intel.com>
Cc: linux-kernel@...r.kernel.org, linux-media@...r.kernel.org,
Yunke Cao <yunkec@...omium.org>, Hans Verkuil <hverkuil@...all.nl>,
Hans de Goede <hdegoede@...hat.com>, Ricardo Ribalda <ribalda@...omium.org>
Subject: [PATCH v4 6/7] media: uvcvideo: Make gpio_unit entity-less
Now that we do not need to export a control there is no need to create
an entity. Move the uvc_gpio structure to uvc_device.
Signed-off-by: Ricardo Ribalda <ribalda@...omium.org>
---
drivers/media/usb/uvc/uvc_driver.c | 7 -------
drivers/media/usb/uvc/uvc_gpio.c | 40 ++++++++++++++------------------------
drivers/media/usb/uvc/uvc_status.c | 4 ++--
drivers/media/usb/uvc/uvcvideo.h | 2 +-
4 files changed, 18 insertions(+), 35 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index c34bfadce60c..ec07c74a5d26 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -1750,13 +1750,6 @@ static int uvc_scan_device(struct uvc_device *dev)
return -1;
}
- /* Add GPIO entity to the first chain. */
- if (dev->gpio_unit) {
- chain = list_first_entry(&dev->chains,
- struct uvc_video_chain, list);
- list_add_tail(&dev->gpio_unit->chain, &chain->entities);
- }
-
return 0;
}
diff --git a/drivers/media/usb/uvc/uvc_gpio.c b/drivers/media/usb/uvc/uvc_gpio.c
index e6fe1845bd01..ad3716d0cf56 100644
--- a/drivers/media/usb/uvc/uvc_gpio.c
+++ b/drivers/media/usb/uvc/uvc_gpio.c
@@ -14,7 +14,7 @@
static irqreturn_t uvc_gpio_irq(int irq, void *data)
{
struct uvc_device *dev = data;
- struct uvc_gpio *uvc_gpio = &dev->gpio_unit->gpio;
+ struct uvc_gpio *uvc_gpio = &dev->gpio_unit;
int new_val;
if (!uvc_gpio->gpio_ready)
@@ -51,7 +51,6 @@ static const struct dmi_system_id privacy_valid_during_streamon[] = {
int uvc_gpio_parse(struct uvc_device *dev)
{
struct gpio_desc *gpio_privacy;
- struct uvc_entity *unit;
int irq;
gpio_privacy = devm_gpiod_get_optional(&dev->intf->dev, "privacy",
@@ -64,11 +63,6 @@ int uvc_gpio_parse(struct uvc_device *dev)
return dev_err_probe(&dev->intf->dev, irq,
"No IRQ for privacy GPIO\n");
- unit = uvc_alloc_new_entity(dev, UVC_EXT_GPIO_UNIT,
- UVC_EXT_GPIO_UNIT_ID, 0, 0);
- if (IS_ERR(unit))
- return PTR_ERR(unit);
-
/*
* Note: This quirk will not match external UVC cameras,
* as they will not have the corresponding ACPI GPIO entity.
@@ -76,38 +70,33 @@ int uvc_gpio_parse(struct uvc_device *dev)
if (dmi_check_system(privacy_valid_during_streamon))
dev->quirks |= UVC_QUIRK_PRIVACY_DURING_STREAM;
else
- unit->gpio.gpio_ready = true;
-
- unit->gpio.gpio_privacy = gpio_privacy;
- unit->gpio.irq = irq;
- strscpy(unit->name, "GPIO", sizeof(unit->name));
- list_add_tail(&unit->list, &dev->entities);
+ dev->gpio_unit.gpio_ready = true;
- dev->gpio_unit = unit;
+ dev->gpio_unit.gpio_privacy = gpio_privacy;
+ dev->gpio_unit.irq = irq;
return 0;
}
void uvc_gpio_quirk(struct uvc_device *dev, bool stream_on)
{
- if (!dev->gpio_unit || !(dev->quirks & UVC_QUIRK_PRIVACY_DURING_STREAM))
+ if (!(dev->quirks & UVC_QUIRK_PRIVACY_DURING_STREAM))
return;
- dev->gpio_unit->gpio.gpio_ready = stream_on;
+ dev->gpio_unit.gpio_ready = stream_on;
if (stream_on)
uvc_gpio_irq(0, dev);
}
int uvc_gpio_init(struct uvc_device *dev)
{
- struct uvc_entity *unit = dev->gpio_unit;
int init_val;
int ret;
- if (!unit || unit->gpio.irq < 0)
+ if (!dev->gpio_unit.gpio_privacy)
return 0;
- ret = request_threaded_irq(unit->gpio.irq, NULL, uvc_gpio_irq,
+ ret = request_threaded_irq(dev->gpio_unit.irq, NULL, uvc_gpio_irq,
IRQF_ONESHOT | IRQF_TRIGGER_FALLING |
IRQF_TRIGGER_RISING,
"uvc_privacy_gpio", dev);
@@ -118,11 +107,12 @@ int uvc_gpio_init(struct uvc_device *dev)
uvc_gpio_quirk(dev, false);
init_val = false;
} else {
- unit->gpio.gpio_ready = true;
+ dev->gpio_unit.gpio_ready = true;
- init_val = gpiod_get_value_cansleep(unit->gpio.gpio_privacy);
+ init_val =
+ gpiod_get_value_cansleep(dev->gpio_unit.gpio_privacy);
if (init_val < 0) {
- free_irq(unit->gpio.irq, dev);
+ free_irq(dev->gpio_unit.irq, dev);
return init_val;
}
}
@@ -130,15 +120,15 @@ int uvc_gpio_init(struct uvc_device *dev)
input_report_switch(dev->input, SW_CAMERA_LENS_COVER, init_val);
input_sync(dev->input);
- unit->gpio.initialized = true;
+ dev->gpio_unit.initialized = true;
return 0;
}
void uvc_gpio_deinit(struct uvc_device *dev)
{
- if (!dev->gpio_unit || !dev->gpio_unit->gpio.initialized)
+ if (!dev->gpio_unit.initialized)
return;
- free_irq(dev->gpio_unit->gpio.irq, dev);
+ free_irq(dev->gpio_unit.irq, dev);
}
diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c
index 319f472213f6..e5ebac1e7093 100644
--- a/drivers/media/usb/uvc/uvc_status.c
+++ b/drivers/media/usb/uvc/uvc_status.c
@@ -44,7 +44,7 @@ static int uvc_input_init(struct uvc_device *dev)
struct input_dev *input;
int ret;
- if (!uvc_input_has_button(dev) && !dev->gpio_unit)
+ if (!uvc_input_has_button(dev) && !dev->gpio_unit.gpio_privacy)
return 0;
input = input_allocate_device();
@@ -64,7 +64,7 @@ static int uvc_input_init(struct uvc_device *dev)
__set_bit(KEY_CAMERA, input->keybit);
}
- if (dev->gpio_unit) {
+ if (dev->gpio_unit.gpio_privacy) {
__set_bit(EV_SW, input->evbit);
__set_bit(SW_CAMERA_LENS_COVER, input->swbit);
}
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 1a784fb76ed7..642449acce1c 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -596,7 +596,7 @@ struct uvc_device {
const void *data;
} async_ctrl;
- struct uvc_entity *gpio_unit;
+ struct uvc_gpio gpio_unit;
};
enum uvc_handle_state {
--
2.47.0.338.g60cca15819-goog
Powered by blists - more mailing lists