The only implementation of this entity was the external privacy gpio,
which now does not require to emulate an entity.
Remove all the dead code.
Signed-off-by: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
---
drivers/media/usb/uvc/uvc_driver.c | 4 ----
drivers/media/usb/uvc/uvc_entity.c | 1 -
drivers/media/usb/uvc/uvcvideo.h | 20 +++++++-------------
3 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index ec07c74a5d26..936225c89182 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -769,7 +769,6 @@ static int uvc_parse_streaming(struct uvc_device *dev,
}
static const u8 uvc_camera_guid[16] = UVC_GUID_UVC_CAMERA;
-static const u8 uvc_gpio_guid[16] = UVC_GUID_EXT_GPIO_CONTROLLER;
static const u8 uvc_media_transport_input_guid[16] =
UVC_GUID_UVC_MEDIA_TRANSPORT_INPUT;
static const u8 uvc_processing_guid[16] = UVC_GUID_UVC_PROCESSING;
@@ -814,9 +813,6 @@ struct uvc_entity *uvc_alloc_new_entity(struct uvc_device *dev, u16 type,
* is initialized by the caller.
*/
switch (type) {
- case UVC_EXT_GPIO_UNIT:
- memcpy(entity->guid, uvc_gpio_guid, 16);
- break;
case UVC_ITT_CAMERA:
memcpy(entity->guid, uvc_camera_guid, 16);
break;
diff --git a/drivers/media/usb/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc_entity.c
index c1b69f9eaa56..36121b111ed5 100644
--- a/drivers/media/usb/uvc/uvc_entity.c
+++ b/drivers/media/usb/uvc/uvc_entity.c
@@ -111,7 +111,6 @@ static int uvc_mc_init_entity(struct uvc_video_chain *chain,
case UVC_OTT_DISPLAY:
case UVC_OTT_MEDIA_TRANSPORT_OUTPUT:
case UVC_EXTERNAL_VENDOR_SPECIFIC:
- case UVC_EXT_GPIO_UNIT:
default:
function = MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN;
break;
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 642449acce1c..5dd9ec1668e6 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -39,9 +39,6 @@
(UVC_ENTITY_IS_TERM(entity) && \
((entity)->type & 0x8000) == UVC_TERM_OUTPUT)
-#define UVC_EXT_GPIO_UNIT 0x7ffe
-#define UVC_EXT_GPIO_UNIT_ID 0x100
-
/* ------------------------------------------------------------------------
* Driver specific constants.
*/
@@ -180,8 +177,7 @@ struct uvc_entity {
/*
* Entities exposed by the UVC device use IDs 0-255, extra entities
- * implemented by the driver (such as the GPIO entity) use IDs 256 and
- * up.
+ * implemented by the driver use IDs 256 and up.
*/
u16 id;
u16 type;
@@ -230,13 +226,6 @@ struct uvc_entity {
u8 *bmControls;
u8 *bmControlsType;
} extension;
-
- struct uvc_gpio {
- int irq;
- bool initialized;
- bool gpio_ready;
- struct gpio_desc *gpio_privacy;
- } gpio;
};
u8 bNrInPins;
@@ -596,7 +585,12 @@ struct uvc_device {
const void *data;
} async_ctrl;
- struct uvc_gpio gpio_unit;
+ struct uvc_gpio {
+ int irq;
+ bool initialized;
+ bool gpio_ready;
+ struct gpio_desc *gpio_privacy;
+ } gpio_unit;
};
enum uvc_handle_state {
--
2.47.0.338.g60cca15819-goog
