media: v4l2-compat-ioctl32.c: move 'helper' functions to __get/put_v4l2_format32

[pandora-kernel.git] / drivers / media / video / v4l2-compat-ioctl32.c

diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c
index 24a49f8..1b8999f 100644 (file)
--- a/drivers/media/video/v4l2-compat-ioctl32.c
+++ b/drivers/media/video/v4l2-compat-ioctl32.c
@@ -89,64 +89,6 @@ static int put_v4l2_window32(struct v4l2_window *kp, struct v4l2_window32 __user
        return 0;
 }
 
        return 0;
 }
 

-static inline int get_v4l2_pix_format(struct v4l2_pix_format *kp, struct v4l2_pix_format __user *up)
-{
-       if (copy_from_user(kp, up, sizeof(struct v4l2_pix_format)))
-               return -EFAULT;
-       return 0;
-}
-
-static inline int get_v4l2_pix_format_mplane(struct v4l2_pix_format_mplane *kp,
-                                            struct v4l2_pix_format_mplane __user *up)
-{
-       if (copy_from_user(kp, up, sizeof(struct v4l2_pix_format_mplane)))
-               return -EFAULT;
-       return 0;
-}
-
-static inline int put_v4l2_pix_format(struct v4l2_pix_format *kp, struct v4l2_pix_format __user *up)
-{
-       if (copy_to_user(up, kp, sizeof(struct v4l2_pix_format)))
-               return -EFAULT;
-       return 0;
-}
-
-static inline int put_v4l2_pix_format_mplane(struct v4l2_pix_format_mplane *kp,
-                                            struct v4l2_pix_format_mplane __user *up)
-{
-       if (copy_to_user(up, kp, sizeof(struct v4l2_pix_format_mplane)))
-               return -EFAULT;
-       return 0;
-}
-
-static inline int get_v4l2_vbi_format(struct v4l2_vbi_format *kp, struct v4l2_vbi_format __user *up)
-{
-       if (copy_from_user(kp, up, sizeof(struct v4l2_vbi_format)))
-               return -EFAULT;
-       return 0;
-}
-
-static inline int put_v4l2_vbi_format(struct v4l2_vbi_format *kp, struct v4l2_vbi_format __user *up)
-{
-       if (copy_to_user(up, kp, sizeof(struct v4l2_vbi_format)))
-               return -EFAULT;
-       return 0;
-}
-
-static inline int get_v4l2_sliced_vbi_format(struct v4l2_sliced_vbi_format *kp, struct v4l2_sliced_vbi_format __user *up)
-{
-       if (copy_from_user(kp, up, sizeof(struct v4l2_sliced_vbi_format)))
-               return -EFAULT;
-       return 0;
-}
-
-static inline int put_v4l2_sliced_vbi_format(struct v4l2_sliced_vbi_format *kp, struct v4l2_sliced_vbi_format __user *up)
-{
-       if (copy_to_user(up, kp, sizeof(struct v4l2_sliced_vbi_format)))
-               return -EFAULT;
-       return 0;
-}
-

 struct v4l2_format32 {
        enum v4l2_buf_type type;
        union {
 struct v4l2_format32 {
        enum v4l2_buf_type type;
        union {


@@ -184,20 +126,23 @@ static int __get_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __us
        switch (kp->type) {
        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT:
        switch (kp->type) {
        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT:

-               return get_v4l2_pix_format(&kp->fmt.pix, &up->fmt.pix);
+               return copy_from_user(&kp->fmt.pix, &up->fmt.pix,
+                                     sizeof(kp->fmt.pix)) ? -EFAULT : 0;

        case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
        case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:

-               return get_v4l2_pix_format_mplane(&kp->fmt.pix_mp,
-                                                 &up->fmt.pix_mp);
+               return copy_from_user(&kp->fmt.pix_mp, &up->fmt.pix_mp,
+                                     sizeof(kp->fmt.pix_mp)) ? -EFAULT : 0;

        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:

-               return get_v4l2_window32(&kp->fmt.win, &up->fmt.win);
+               return get_v4l2_window32(&kp->fmt.win, &up->fmt.win);

        case V4L2_BUF_TYPE_VBI_CAPTURE:
        case V4L2_BUF_TYPE_VBI_OUTPUT:
        case V4L2_BUF_TYPE_VBI_CAPTURE:
        case V4L2_BUF_TYPE_VBI_OUTPUT:

-               return get_v4l2_vbi_format(&kp->fmt.vbi, &up->fmt.vbi);
+               return copy_from_user(&kp->fmt.vbi, &up->fmt.vbi,
+                                     sizeof(kp->fmt.vbi)) ? -EFAULT : 0;

        case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
        case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
        case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
        case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:

-               return get_v4l2_sliced_vbi_format(&kp->fmt.sliced, &up->fmt.sliced);
+               return copy_from_user(&kp->fmt.sliced, &up->fmt.sliced,
+                                     sizeof(kp->fmt.sliced)) ? -EFAULT : 0;

        case V4L2_BUF_TYPE_PRIVATE:
                if (copy_from_user(kp, up, sizeof(kp->fmt.raw_data)))
                        return -EFAULT;
        case V4L2_BUF_TYPE_PRIVATE:
                if (copy_from_user(kp, up, sizeof(kp->fmt.raw_data)))
                        return -EFAULT;


@@ -232,20 +177,23 @@ static int __put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __us
        switch (kp->type) {
        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT:
        switch (kp->type) {
        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT:

-               return put_v4l2_pix_format(&kp->fmt.pix, &up->fmt.pix);
+               return copy_to_user(&up->fmt.pix, &kp->fmt.pix,
+                                   sizeof(kp->fmt.pix)) ? -EFAULT : 0;

        case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
        case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:

-               return put_v4l2_pix_format_mplane(&kp->fmt.pix_mp,
-                                                 &up->fmt.pix_mp);
+               return copy_to_user(&up->fmt.pix_mp, &kp->fmt.pix_mp,
+                                   sizeof(kp->fmt.pix_mp)) ? -EFAULT : 0;

        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
                return put_v4l2_window32(&kp->fmt.win, &up->fmt.win);
        case V4L2_BUF_TYPE_VBI_CAPTURE:
        case V4L2_BUF_TYPE_VBI_OUTPUT:
        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
                return put_v4l2_window32(&kp->fmt.win, &up->fmt.win);
        case V4L2_BUF_TYPE_VBI_CAPTURE:
        case V4L2_BUF_TYPE_VBI_OUTPUT:

-               return put_v4l2_vbi_format(&kp->fmt.vbi, &up->fmt.vbi);
+               return copy_to_user(&up->fmt.vbi, &kp->fmt.vbi,
+                                   sizeof(kp->fmt.vbi)) ? -EFAULT : 0;

        case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
        case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
        case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
        case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:

-               return put_v4l2_sliced_vbi_format(&kp->fmt.sliced, &up->fmt.sliced);
+               return copy_to_user(&up->fmt.sliced, &kp->fmt.sliced,
+                                   sizeof(kp->fmt.sliced)) ? -EFAULT : 0;

        case V4L2_BUF_TYPE_PRIVATE:
                if (copy_to_user(up, kp, sizeof(up->fmt.raw_data)))
                        return -EFAULT;
        case V4L2_BUF_TYPE_PRIVATE:
                if (copy_to_user(up, kp, sizeof(up->fmt.raw_data)))
                        return -EFAULT;


@@ -544,10 +492,10 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
        if (!access_ok(VERIFY_READ, up, sizeof(struct v4l2_framebuffer32)) ||
            get_user(tmp, &up->base) ||
            get_user(kp->capability, &up->capability) ||
        if (!access_ok(VERIFY_READ, up, sizeof(struct v4l2_framebuffer32)) ||
            get_user(tmp, &up->base) ||
            get_user(kp->capability, &up->capability) ||

-           get_user(kp->flags, &up->flags))
+           get_user(kp->flags, &up->flags) ||
+           copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))

                return -EFAULT;
        kp->base = (__force void *)compat_ptr(tmp);
                return -EFAULT;
        kp->base = (__force void *)compat_ptr(tmp);

-       get_v4l2_pix_format(&kp->fmt, &up->fmt);

        return 0;
 }
 
        return 0;
 }
 


@@ -558,9 +506,9 @@ static int put_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
        if (!access_ok(VERIFY_WRITE, up, sizeof(struct v4l2_framebuffer32)) ||
            put_user(tmp, &up->base) ||
            put_user(kp->capability, &up->capability) ||
        if (!access_ok(VERIFY_WRITE, up, sizeof(struct v4l2_framebuffer32)) ||
            put_user(tmp, &up->base) ||
            put_user(kp->capability, &up->capability) ||

-           put_user(kp->flags, &up->flags))
+           put_user(kp->flags, &up->flags) ||
+           copy_to_user(&up->fmt, &kp->fmt, sizeof(up->fmt)))

                return -EFAULT;
                return -EFAULT;

-       put_v4l2_pix_format(&kp->fmt, &up->fmt);

        return 0;
 }
 
        return 0;
 }