V4L/DVB (13668): tw9910: remove cropping

Cropping is used for data input, and it is not needed now

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 3f96cb5..e70905c 100644 (file)
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -329,13 +329,6 @@ static const struct tw9910_scale_ctrl tw9910_pal_scales[] = {
        },
 };
 
-static const struct tw9910_cropping_ctrl tw9910_cropping_ctrl = {
-       .vdelay  = 0x0012,
-       .vactive = 0x00F0,
-       .hdelay  = 0x0010,
-       .hactive = 0x02D0,
-};
-
 static const struct tw9910_hsync_ctrl tw9910_hsync_ctrl = {
        .start = 0x0260,
        .end   = 0x0300,
@@ -385,40 +378,6 @@ static int tw9910_set_scale(struct i2c_client *client,
        return ret;
 }
 
-static int tw9910_set_cropping(struct i2c_client *client,
-                              const struct tw9910_cropping_ctrl *cropping)
-{
-       int ret;
-
-       ret = i2c_smbus_write_byte_data(client, CROP_HI,
-                                       (cropping->vdelay  & 0x0300) >> 2 |
-                                       (cropping->vactive & 0x0300) >> 4 |
-                                       (cropping->hdelay  & 0x0300) >> 6 |
-                                       (cropping->hactive & 0x0300) >> 8);
-       if (ret < 0)
-               return ret;
-
-       ret = i2c_smbus_write_byte_data(client, VDELAY_LO,
-                                       cropping->vdelay & 0x00FF);
-       if (ret < 0)
-               return ret;
-
-       ret = i2c_smbus_write_byte_data(client, VACTIVE_LO,
-                                       cropping->vactive & 0x00FF);
-       if (ret < 0)
-               return ret;
-
-       ret = i2c_smbus_write_byte_data(client, HDELAY_LO,
-                                       cropping->hdelay & 0x00FF);
-       if (ret < 0)
-               return ret;
-
-       ret = i2c_smbus_write_byte_data(client, HACTIVE_LO,
-                                       cropping->hactive & 0x00FF);
-
-       return ret;
-}
-
 static int tw9910_set_hsync(struct i2c_client *client,
                            const struct tw9910_hsync_ctrl *hsync)
 {
@@ -709,13 +668,6 @@ static int tw9910_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
                goto tw9910_set_fmt_error;
 
        /*
-        * set cropping
-        */
-       ret = tw9910_set_cropping(client, &tw9910_cropping_ctrl);
-       if (ret < 0)
-               goto tw9910_set_fmt_error;
-
-       /*
         * set hsync
         */
        ret = tw9910_set_hsync(client, &tw9910_hsync_ctrl);