media: uvcvideo: Rename uvc_format 'frame' field to 'frames'

The uvc_format 'frame' field points to an array of frames. Rename it to
'frames' to make this clearer.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 8a1698e129772935a4c0dc9e8da69f0df90f6257..445a7ae69b9b6821df76441d56e424f50d2c3afd 100644 (file)
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -339,8 +339,8 @@ static int uvc_parse_format(struct uvc_device *dev,
                ftype = 0;
 
                /* Create a dummy frame descriptor. */
-               frame = &format->frame[0];
-               memset(&format->frame[0], 0, sizeof(format->frame[0]));
+               frame = &format->frames[0];
+               memset(&format->frames[0], 0, sizeof(format->frames[0]));
                frame->bFrameIntervalType = 1;
                frame->dwDefaultFrameInterval = 1;
                frame->dwFrameInterval = *intervals;
@@ -370,7 +370,7 @@ static int uvc_parse_format(struct uvc_device *dev,
         */
        while (buflen > 2 && buffer[1] == USB_DT_CS_INTERFACE &&
               buffer[2] == ftype) {
-               frame = &format->frame[format->nframes];
+               frame = &format->frames[format->nframes];
                if (ftype != UVC_VS_FRAME_FRAME_BASED)
                        n = buflen > 25 ? buffer[25] : 0;
                else
@@ -687,7 +687,7 @@ static int uvc_parse_streaming(struct uvc_device *dev,
                case UVC_VS_FORMAT_MJPEG:
                case UVC_VS_FORMAT_DV:
                case UVC_VS_FORMAT_FRAME_BASED:
-                       format->frame = frame;
+                       format->frames = frame;
                        ret = uvc_parse_format(dev, streaming, format,
                                &interval, buffer, buflen);
                        if (ret < 0)

diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 6960d7ebd904601874d9df5eb62ba93dc381baad..e7261b2543cb021a70389999852f3175ae3593cc 100644 (file)
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -255,14 +255,14 @@ static int uvc_v4l2_try_format(struct uvc_streaming *stream,
        maxd = (unsigned int)-1;
 
        for (i = 0; i < format->nframes; ++i) {
-               u16 w = format->frame[i].wWidth;
-               u16 h = format->frame[i].wHeight;
+               u16 w = format->frames[i].wWidth;
+               u16 h = format->frames[i].wHeight;
 
                d = min(w, rw) * min(h, rh);
                d = w*h + rw*rh - 2*d;
                if (d < maxd) {
                        maxd = d;
-                       frame = &format->frame[i];
+                       frame = &format->frames[i];
                }
 
                if (maxd == 0)
@@ -331,8 +331,8 @@ static int uvc_v4l2_try_format(struct uvc_streaming *stream,
                        probe->bFormatIndex);
 
        for (i = 0; i < format->nframes; ++i) {
-               if (probe->bFrameIndex == format->frame[i].bFrameIndex) {
-                       frame = &format->frame[i];
+               if (probe->bFrameIndex == format->frames[i].bFrameIndex) {
+                       frame = &format->frames[i];
                        break;
                }
        }
@@ -501,19 +501,19 @@ static int uvc_v4l2_set_streamparm(struct uvc_streaming *stream,
        for (i = 0; i < format->nframes && maxd != 0; i++) {
                u32 d, ival;
 
-               if (&format->frame[i] == stream->cur_frame)
+               if (&format->frames[i] == stream->cur_frame)
                        continue;
 
-               if (format->frame[i].wWidth != stream->cur_frame->wWidth ||
-                   format->frame[i].wHeight != stream->cur_frame->wHeight)
+               if (format->frames[i].wWidth != stream->cur_frame->wWidth ||
+                   format->frames[i].wHeight != stream->cur_frame->wHeight)
                        continue;
 
-               ival = uvc_try_frame_interval(&format->frame[i], interval);
+               ival = uvc_try_frame_interval(&format->frames[i], interval);
                d = abs((s32)ival - interval);
                if (d >= maxd)
                        continue;
 
-               frame = &format->frame[i];
+               frame = &format->frames[i];
                probe.bFrameIndex = frame->bFrameIndex;
                probe.dwFrameInterval = ival;
                maxd = d;
@@ -1266,10 +1266,10 @@ static int uvc_ioctl_enum_framesizes(struct file *file, void *fh,
 
        /* Skip duplicate frame sizes */
        for (i = 0, index = 0; i < format->nframes; i++) {
-               if (frame && frame->wWidth == format->frame[i].wWidth &&
-                   frame->wHeight == format->frame[i].wHeight)
+               if (frame && frame->wWidth == format->frames[i].wWidth &&
+                   frame->wHeight == format->frames[i].wHeight)
                        continue;
-               frame = &format->frame[i];
+               frame = &format->frames[i];
                if (index == fsize->index)
                        break;
                index++;
@@ -1307,9 +1307,9 @@ static int uvc_ioctl_enum_frameintervals(struct file *file, void *fh,
 
        index = fival->index;
        for (i = 0; i < format->nframes; i++) {
-               if (format->frame[i].wWidth == fival->width &&
-                   format->frame[i].wHeight == fival->height) {
-                       frame = &format->frame[i];
+               if (format->frames[i].wWidth == fival->width &&
+                   format->frames[i].wHeight == fival->height) {
+                       frame = &format->frames[i];
                        nintervals = frame->bFrameIntervalType ?: 1;
                        if (index < nintervals)
                                break;

diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index af540f435099ff397eca8d38200fd38a8dc08a25..34c781b7dee204836e3d735ac4665a46eb9094cd 100644 (file)
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -176,8 +176,8 @@ static void uvc_fixup_video_ctrl(struct uvc_streaming *stream,
                return;
 
        for (i = 0; i < format->nframes; ++i) {
-               if (format->frame[i].bFrameIndex == ctrl->bFrameIndex) {
-                       frame = &format->frame[i];
+               if (format->frames[i].bFrameIndex == ctrl->bFrameIndex) {
+                       frame = &format->frames[i];
                        break;
                }
        }
@@ -2179,7 +2179,7 @@ int uvc_video_init(struct uvc_streaming *stream)
         * descriptor is not found, use the first available frame.
         */
        for (i = format->nframes; i > 0; --i) {
-               frame = &format->frame[i-1];
+               frame = &format->frames[i-1];
                if (frame->bFrameIndex == probe->bFrameIndex)
                        break;
        }

diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 05fec637417dface320c2c94df0a025c7a6b90f7..bb077363717127c21ca8f6553be648798b744dd9 100644 (file)
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -265,7 +265,7 @@ struct uvc_format {
        u32 flags;
 
        unsigned int nframes;
-       struct uvc_frame *frame;
+       struct uvc_frame *frames;
 };
 
 struct uvc_streaming_header {