V4L/DVB (10011): m5602: Remove the write and read sensor from the main struct

Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.h b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
index 4b4c196..0fe4d63 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_mt9m111.h
+++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
@@ -109,9 +109,6 @@ static struct m5602_sensor mt9m111 = {
        .init = mt9m111_init,
        .power_down = mt9m111_power_down,
 
-       .read_sensor = mt9m111_read_sensor,
-       .write_sensor = mt9m111_write_sensor,
-
        .nctrls = 3,
        .ctrls = {
        {

diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.h b/drivers/media/video/gspca/m5602/m5602_ov9650.h
index 4d90bd0..32fc440 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_ov9650.h
+++ b/drivers/media/video/gspca/m5602/m5602_ov9650.h
@@ -156,8 +156,6 @@ static struct m5602_sensor ov9650 = {
        .probe = ov9650_probe,
        .init = ov9650_init,
        .power_down = ov9650_power_down,
-       .read_sensor = ov9650_read_sensor,
-       .write_sensor = ov9650_write_sensor,
 
        .nctrls = 8,
        .ctrls = {
@@ -341,7 +339,7 @@ static const unsigned char init_ov9650[][3] =
        {SENSOR, OV9650_ACOM38, 0x81},
        /* Turn off color matrix coefficient double option */
        {SENSOR, OV9650_COM16, 0x00},
-               /* Enable color matrix for RGB/YUV, Delay Y channel,
+       /* Enable color matrix for RGB/YUV, Delay Y channel,
        set output Y/UV delay to 1 */
        {SENSOR, OV9650_COM13, 0x19},
        /* Enable digital BLC, Set output mode to U Y V Y */

diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
index 1ee649b..701d302 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
@@ -86,8 +86,6 @@ static struct m5602_sensor s5k4aa = {
        .probe = s5k4aa_probe,
        .init = s5k4aa_init,
        .power_down = s5k4aa_power_down,
-       .read_sensor = s5k4aa_read_sensor,
-       .write_sensor = s5k4aa_write_sensor,
        .i2c_slave_id = 0x5a,
        .nctrls = 4,
        .ctrls = {

diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
index 5080da1..793c967 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_s5k83a.h
+++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
@@ -68,8 +68,6 @@ static struct m5602_sensor s5k83a = {
        .probe = s5k83a_probe,
        .init = s5k83a_init,
        .power_down = s5k83a_power_down,
-       .read_sensor = s5k83a_read_sensor,
-       .write_sensor = s5k83a_write_sensor,
        .i2c_slave_id = 0x5a,
        .nctrls = 5,
        .ctrls = {

diff --git a/drivers/media/video/gspca/m5602/m5602_sensor.h b/drivers/media/video/gspca/m5602/m5602_sensor.h
index 60c9a48..c090002 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_sensor.h
+++ b/drivers/media/video/gspca/m5602/m5602_sensor.h
@@ -58,14 +58,6 @@ struct m5602_sensor {
        /* Performs a power down sequence */
        int (*power_down)(struct sd *sd);
 
-       /* Reads a sensor register */
-       int (*read_sensor)(struct sd *sd, const u8 address,
-             u8 *i2c_data, const u8 len);
-
-       /* Writes to a sensor register */
-       int (*write_sensor)(struct sd *sd, const u8 address,
-             u8 *i2c_data, const u8 len);
-
        int nctrls;
        struct ctrl ctrls[M5602_MAX_CTRLS];