V4L/DVB: saa7134: convert to use the new mbus API

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 852040b6b5a6eb4357866d9493719f14a685a01f..40fd31ca7716da6ae74ee2b76697fa4d615f54b0 100644 (file)
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -860,16 +860,6 @@ static int saa6752hs_g_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefm
        return 0;
 }
 
-static int saa6752hs_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
-{
-       struct v4l2_mbus_framefmt mbus_fmt;
-       int err = saa6752hs_g_mbus_fmt(sd, &mbus_fmt);
-
-       f->fmt.pix.width = mbus_fmt.width;
-       f->fmt.pix.height = mbus_fmt.height;
-       return err;
-}
-
 static int saa6752hs_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *f)
 {
        struct saa6752hs_state *h = to_state(sd);
@@ -917,16 +907,6 @@ static int saa6752hs_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefm
        return 0;
 }
 
-static int saa6752hs_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
-{
-       struct v4l2_mbus_framefmt mbus_fmt;
-
-       mbus_fmt.width = f->fmt.pix.width;
-       mbus_fmt.height = f->fmt.pix.height;
-       mbus_fmt.code = V4L2_MBUS_FMT_FIXED;
-       return saa6752hs_s_mbus_fmt(sd, &mbus_fmt);
-}
-
 static int saa6752hs_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
 {
        struct saa6752hs_state *h = to_state(sd);
@@ -958,8 +938,6 @@ static const struct v4l2_subdev_core_ops saa6752hs_core_ops = {
 };
 
 static const struct v4l2_subdev_video_ops saa6752hs_video_ops = {
-       .s_fmt = saa6752hs_s_fmt,
-       .g_fmt = saa6752hs_g_fmt,
        .s_mbus_fmt = saa6752hs_s_mbus_fmt,
        .g_mbus_fmt = saa6752hs_g_mbus_fmt,
 };

diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index ea877a50f52d9b65963e1edfcf81b81f356b807e..e763f9fd0133f06c1ebed3f4add1ac82dc30f166 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -223,9 +223,11 @@ static int empress_g_fmt_vid_cap(struct file *file, void *priv,
                                struct v4l2_format *f)
 {
        struct saa7134_dev *dev = file->private_data;
+       struct v4l2_mbus_framefmt mbus_fmt;
 
-       saa_call_all(dev, video, g_fmt, f);
+       saa_call_all(dev, video, g_mbus_fmt, &mbus_fmt);
 
+       v4l2_fill_pix_format(&f->fmt.pix, &mbus_fmt);
        f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
        f->fmt.pix.sizeimage    = TS_PACKET_SIZE * dev->ts.nr_packets;
 
@@ -236,8 +238,11 @@ static int empress_s_fmt_vid_cap(struct file *file, void *priv,
                                struct v4l2_format *f)
 {
        struct saa7134_dev *dev = file->private_data;
+       struct v4l2_mbus_framefmt mbus_fmt;
 
-       saa_call_all(dev, video, s_fmt, f);
+       v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, V4L2_MBUS_FMT_FIXED);
+       saa_call_all(dev, video, s_mbus_fmt, &mbus_fmt);
+       v4l2_fill_pix_format(&f->fmt.pix, &mbus_fmt);
 
        f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
        f->fmt.pix.sizeimage    = TS_PACKET_SIZE * dev->ts.nr_packets;