V4L/DVB (8482): videodev: move all ioctl callbacks to a new v4l2_ioctl_ops struct

[safe/jmp/linux-2.6] / drivers / media / video / mt9v022.c

diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c
index a2f161d..b31ba4e 100644 (file)
--- a/drivers/media/video/mt9v022.c
+++ b/drivers/media/video/mt9v022.c
@@ -13,15 +13,12 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/log2.h>
+#include <linux/gpio.h>
 
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/soc_camera.h>
 
-#ifdef CONFIG_MT9M001_PCA9536_SWITCH
-#include <asm/gpio.h>
-#endif
-
 /* mt9v022 i2c address 0x48, 0x4c, 0x58, 0x5c
  * The platform has to define i2c_board_info
  * and call i2c_register_board_info() */
@@ -91,7 +88,7 @@ static const struct soc_camera_data_format mt9v022_monochrome_formats[] = {
 struct mt9v022 {
        struct i2c_client *client;
        struct soc_camera_device icd;
-       int model;      /* V4L2_IDENT_MT9M001* codes from v4l2-chip-ident.h */
+       int model;      /* V4L2_IDENT_MT9V022* codes from v4l2-chip-ident.h */
        int switch_gpio;
        u16 chip_control;
        unsigned char datawidth;
@@ -452,7 +449,7 @@ static int mt9v022_set_register(struct soc_camera_device *icd,
 }
 #endif
 
-const struct v4l2_queryctrl mt9v022_controls[] = {
+static const struct v4l2_queryctrl mt9v022_controls[] = {
        {
                .id             = V4L2_CID_VFLIP,
                .type           = V4L2_CTRL_TYPE_BOOLEAN,
@@ -506,13 +503,15 @@ const struct v4l2_queryctrl mt9v022_controls[] = {
        }
 };
 
-static int mt9v022_get_control(struct soc_camera_device *icd,
-                              struct v4l2_control *ctrl);
-static int mt9v022_set_control(struct soc_camera_device *icd,
-                              struct v4l2_control *ctrl);
+static int mt9v022_video_probe(struct soc_camera_device *);
+static void mt9v022_video_remove(struct soc_camera_device *);
+static int mt9v022_get_control(struct soc_camera_device *, struct v4l2_control *);
+static int mt9v022_set_control(struct soc_camera_device *, struct v4l2_control *);
 
 static struct soc_camera_ops mt9v022_ops = {
        .owner                  = THIS_MODULE,
+       .probe                  = mt9v022_video_probe,
+       .remove                 = mt9v022_video_remove,
        .init                   = mt9v022_init,
        .release                = mt9v022_release,
        .start_capture          = mt9v022_start_capture,
@@ -521,8 +520,6 @@ static struct soc_camera_ops mt9v022_ops = {
        .try_fmt_cap            = mt9v022_try_fmt_cap,
        .set_bus_param          = mt9v022_set_bus_param,
        .query_bus_param        = mt9v022_query_bus_param,
-       .formats                = NULL, /* Filled in later depending on the */
-       .num_formats            = 0,    /* sensor type and data widths */
        .controls               = mt9v022_controls,
        .num_controls           = ARRAY_SIZE(mt9v022_controls),
        .get_control            = mt9v022_get_control,
@@ -705,19 +702,19 @@ static int mt9v022_video_probe(struct soc_camera_device *icd)
                            !strcmp("color", sensor_type))) {
                ret = reg_write(icd, MT9V022_PIXEL_OPERATION_MODE, 4 | 0x11);
                mt9v022->model = V4L2_IDENT_MT9V022IX7ATC;
-               mt9v022_ops.formats = mt9v022_colour_formats;
+               icd->formats = mt9v022_colour_formats;
                if (mt9v022->client->dev.platform_data)
-                       mt9v022_ops.num_formats = ARRAY_SIZE(mt9v022_colour_formats);
+                       icd->num_formats = ARRAY_SIZE(mt9v022_colour_formats);
                else
-                       mt9v022_ops.num_formats = 1;
+                       icd->num_formats = 1;
        } else {
                ret = reg_write(icd, MT9V022_PIXEL_OPERATION_MODE, 0x11);
                mt9v022->model = V4L2_IDENT_MT9V022IX7ATM;
-               mt9v022_ops.formats = mt9v022_monochrome_formats;
+               icd->formats = mt9v022_monochrome_formats;
                if (mt9v022->client->dev.platform_data)
-                       mt9v022_ops.num_formats = ARRAY_SIZE(mt9v022_monochrome_formats);
+                       icd->num_formats = ARRAY_SIZE(mt9v022_monochrome_formats);
                else
-                       mt9v022_ops.num_formats = 1;
+                       icd->num_formats = 1;
        }
 
        if (ret >= 0)
@@ -745,7 +742,8 @@ static void mt9v022_video_remove(struct soc_camera_device *icd)
        soc_camera_video_stop(&mt9v022->icd);
 }
 
-static int mt9v022_probe(struct i2c_client *client)
+static int mt9v022_probe(struct i2c_client *client,
+                        const struct i2c_device_id *did)
 {
        struct mt9v022 *mt9v022;
        struct soc_camera_device *icd;
@@ -773,8 +771,6 @@ static int mt9v022_probe(struct i2c_client *client)
        i2c_set_clientdata(client, mt9v022);
 
        icd = &mt9v022->icd;
-       icd->probe      = mt9v022_video_probe;
-       icd->remove     = mt9v022_video_remove;
        icd->ops        = &mt9v022_ops;
        icd->control    = &client->dev;
        icd->x_min      = 1;
@@ -819,6 +815,11 @@ static int mt9v022_remove(struct i2c_client *client)
 
        return 0;
 }
+static const struct i2c_device_id mt9v022_id[] = {
+       { "mt9v022", 0 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, mt9v022_id);
 
 static struct i2c_driver mt9v022_i2c_driver = {
        .driver = {
@@ -826,6 +827,7 @@ static struct i2c_driver mt9v022_i2c_driver = {
        },
        .probe          = mt9v022_probe,
        .remove         = mt9v022_remove,
+       .id_table       = mt9v022_id,
 };
 
 static int __init mt9v022_mod_init(void)