[media] uvcvideo: Replace memcpy with struct assignment

This kind of memcpy() is error-prone. Its replacement with a struct
assignment is prefered because it's type-safe and much easier to read.

Signed-off-by: Peter Senna Tschudin <[email protected]>
Signed-off-by: Ezequiel Garcia <[email protected]>
Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index d5baab17a5ef77b6bbeb85f8cf3e2c1b0127b5b7..61e28dec991d1c7375c0e9749ad639deaf8761f8 100644 (file)
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -1838,7 +1838,7 @@ static int uvc_ctrl_add_info(struct uvc_device *dev, struct uvc_control *ctrl,
 {
        int ret = 0;
 
-       memcpy(&ctrl->info, info, sizeof(*info));
+       ctrl->info = *info;
        INIT_LIST_HEAD(&ctrl->info.mappings);
 
        /* Allocate an array to save control values (cur, def, max, etc.) */

diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 68d59b52749288e00dcb816f42952516f160f6db..97a4ffde5d6f094ec68c8a86898e2b7d3a909687 100644 (file)
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -315,7 +315,7 @@ static int uvc_v4l2_set_format(struct uvc_streaming *stream,
                goto done;
        }
 
-       memcpy(&stream->ctrl, &probe, sizeof probe);
+       stream->ctrl = probe;
        stream->cur_format = format;
        stream->cur_frame = frame;
 
@@ -387,7 +387,7 @@ static int uvc_v4l2_set_streamparm(struct uvc_streaming *stream,
                return -EBUSY;
        }
 
-       memcpy(&probe, &stream->ctrl, sizeof probe);
+       probe = stream->ctrl;
        probe.dwFrameInterval =
                uvc_try_frame_interval(stream->cur_frame, interval);
 
@@ -398,7 +398,7 @@ static int uvc_v4l2_set_streamparm(struct uvc_streaming *stream,
                return ret;
        }
 
-       memcpy(&stream->ctrl, &probe, sizeof probe);
+       stream->ctrl = probe;
        mutex_unlock(&stream->mutex);
 
        /* Return the actual frame period. */