[media] V4L: mt9t031: remove superfluous soc-camera client operations
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Thu, 28 Jul 2011 17:42:22 +0000 (14:42 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 3 Nov 2011 20:27:56 +0000 (18:27 -0200)
Now that all soc-camera hosts have been ported to use V4L2 subdevice
mediabus-config operations and soc-camera client bus-parameter operations
have been made optional, they can be removed.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/mt9t031.c

index c5adb23014807f961a936c6723ff6d03f0062b32..25fb833f6f2c08d759eef7a3562a87b82fced7c2 100644 (file)
 #define MT9T031_COLUMN_SKIP            32
 #define MT9T031_ROW_SKIP               20
 
-#define MT9T031_BUS_PARAM      (SOCAM_PCLK_SAMPLE_RISING |     \
-       SOCAM_PCLK_SAMPLE_FALLING | SOCAM_HSYNC_ACTIVE_HIGH |   \
-       SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_HIGH |      \
-       SOCAM_MASTER | SOCAM_DATAWIDTH_10)
-
 struct mt9t031 {
        struct v4l2_subdev subdev;
        struct v4l2_rect rect;  /* Sensor window */
@@ -180,30 +175,6 @@ static int mt9t031_s_stream(struct v4l2_subdev *sd, int enable)
        return 0;
 }
 
-static int mt9t031_set_bus_param(struct soc_camera_device *icd,
-                                unsigned long flags)
-{
-       struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
-
-       /* The caller should have queried our parameters, check anyway */
-       if (flags & ~MT9T031_BUS_PARAM)
-               return -EINVAL;
-
-       if (flags & SOCAM_PCLK_SAMPLE_FALLING)
-               reg_clear(client, MT9T031_PIXEL_CLOCK_CONTROL, 0x8000);
-       else
-               reg_set(client, MT9T031_PIXEL_CLOCK_CONTROL, 0x8000);
-
-       return 0;
-}
-
-static unsigned long mt9t031_query_bus_param(struct soc_camera_device *icd)
-{
-       struct soc_camera_link *icl = to_soc_camera_link(icd);
-
-       return soc_camera_apply_sensor_flags(icl, MT9T031_BUS_PARAM);
-}
-
 enum {
        MT9T031_CTRL_VFLIP,
        MT9T031_CTRL_HFLIP,
@@ -263,8 +234,6 @@ static const struct v4l2_queryctrl mt9t031_controls[] = {
 };
 
 static struct soc_camera_ops mt9t031_ops = {
-       .set_bus_param          = mt9t031_set_bus_param,
-       .query_bus_param        = mt9t031_query_bus_param,
        .controls               = mt9t031_controls,
        .num_controls           = ARRAY_SIZE(mt9t031_controls),
 };