media: uvcvideo: Provide sync and async uvc_ctrl_status_event

commit d9c8763e61295be0a21dc04ad9c379d5d17c3d86 upstream.

Split the functionality of void uvc_ctrl_status_event_work in two, so it
can be called by functions outside interrupt context and not part of an
URB.

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index cb6046481aed332e53c2ee57bb951d4e8f5ba068..c0650c49c9abdf8cc25dbc53bc43921d52976c40 100644 (file)
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -1280,17 +1280,12 @@ static void uvc_ctrl_send_slave_event(struct uvc_video_chain *chain,
        uvc_ctrl_send_event(chain, handle, ctrl, mapping, val, changes);
 }
 
-static void uvc_ctrl_status_event_work(struct work_struct *work)
+void uvc_ctrl_status_event(struct uvc_video_chain *chain,
+                          struct uvc_control *ctrl, const u8 *data)
 {
-       struct uvc_device *dev = container_of(work, struct uvc_device,
-                                             async_ctrl.work);
-       struct uvc_ctrl_work *w = &dev->async_ctrl;
-       struct uvc_video_chain *chain = w->chain;
        struct uvc_control_mapping *mapping;
-       struct uvc_control *ctrl = w->ctrl;
        struct uvc_fh *handle;
        unsigned int i;
-       int ret;
 
        mutex_lock(&chain->ctrl_mutex);
 
@@ -1298,7 +1293,7 @@ static void uvc_ctrl_status_event_work(struct work_struct *work)
        ctrl->handle = NULL;
 
        list_for_each_entry(mapping, &ctrl->info.mappings, list) {
-               s32 value = __uvc_ctrl_get_value(mapping, w->data);
+               s32 value = __uvc_ctrl_get_value(mapping, data);
 
                /*
                 * handle may be NULL here if the device sends auto-update
@@ -1317,6 +1312,16 @@ static void uvc_ctrl_status_event_work(struct work_struct *work)
        }
 
        mutex_unlock(&chain->ctrl_mutex);
+}
+
+static void uvc_ctrl_status_event_work(struct work_struct *work)
+{
+       struct uvc_device *dev = container_of(work, struct uvc_device,
+                                             async_ctrl.work);
+       struct uvc_ctrl_work *w = &dev->async_ctrl;
+       int ret;
+
+       uvc_ctrl_status_event(w->chain, w->ctrl, w->data);
 
        /* Resubmit the URB. */
        w->urb->interval = dev->int_ep->desc.bInterval;
@@ -1326,8 +1331,8 @@ static void uvc_ctrl_status_event_work(struct work_struct *work)
                           ret);
 }
 
-bool uvc_ctrl_status_event(struct urb *urb, struct uvc_video_chain *chain,
-                          struct uvc_control *ctrl, const u8 *data)
+bool uvc_ctrl_status_event_async(struct urb *urb, struct uvc_video_chain *chain,
+                                struct uvc_control *ctrl, const u8 *data)
 {
        struct uvc_device *dev = chain->dev;
        struct uvc_ctrl_work *w = &dev->async_ctrl;

diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c
index 883e4cab45e79b1d3e1d0636963acfac73aa420b..fd2a9b5a62e9041953ac06cd10f7ab8d4559e63a 100644 (file)
--- a/drivers/media/usb/uvc/uvc_status.c
+++ b/drivers/media/usb/uvc/uvc_status.c
@@ -184,7 +184,8 @@ static bool uvc_event_control(struct urb *urb,
 
        switch (status->bAttribute) {
        case UVC_CTRL_VALUE_CHANGE:
-               return uvc_ctrl_status_event(urb, chain, ctrl, status->bValue);
+               return uvc_ctrl_status_event_async(urb, chain, ctrl,
+                                                  status->bValue);
 
        case UVC_CTRL_INFO_CHANGE:
        case UVC_CTRL_FAILURE_CHANGE:

diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 839ba3cc531194ccb2748f454deca43c2486c6e0..38951d7b646a549b94f3096c6a4dfe989e273415 100644 (file)
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -768,7 +768,9 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain,
 int uvc_ctrl_init_device(struct uvc_device *dev);
 void uvc_ctrl_cleanup_device(struct uvc_device *dev);
 int uvc_ctrl_restore_values(struct uvc_device *dev);
-bool uvc_ctrl_status_event(struct urb *urb, struct uvc_video_chain *chain,
+bool uvc_ctrl_status_event_async(struct urb *urb, struct uvc_video_chain *chain,
+                                struct uvc_control *ctrl, const u8 *data);
+void uvc_ctrl_status_event(struct uvc_video_chain *chain,
                           struct uvc_control *ctrl, const u8 *data);
 
 int uvc_ctrl_begin(struct uvc_video_chain *chain);