aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/gspca/m5602/m5602_mt9m111.h3
-rw-r--r--drivers/media/video/gspca/m5602/m5602_ov9650.h4
-rw-r--r--drivers/media/video/gspca/m5602/m5602_s5k4aa.h2
-rw-r--r--drivers/media/video/gspca/m5602/m5602_s5k83a.h2
-rw-r--r--drivers/media/video/gspca/m5602/m5602_sensor.h8
5 files changed, 1 insertions, 18 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.h b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
index 4b4c1967be7..0fe4d632789 100644
--- 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 = {
109 .init = mt9m111_init, 109 .init = mt9m111_init,
110 .power_down = mt9m111_power_down, 110 .power_down = mt9m111_power_down,
111 111
112 .read_sensor = mt9m111_read_sensor,
113 .write_sensor = mt9m111_write_sensor,
114
115 .nctrls = 3, 112 .nctrls = 3,
116 .ctrls = { 113 .ctrls = {
117 { 114 {
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.h b/drivers/media/video/gspca/m5602/m5602_ov9650.h
index 4d90bd08509..32fc440c5c1 100644
--- 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 = {
156 .probe = ov9650_probe, 156 .probe = ov9650_probe,
157 .init = ov9650_init, 157 .init = ov9650_init,
158 .power_down = ov9650_power_down, 158 .power_down = ov9650_power_down,
159 .read_sensor = ov9650_read_sensor,
160 .write_sensor = ov9650_write_sensor,
161 159
162 .nctrls = 8, 160 .nctrls = 8,
163 .ctrls = { 161 .ctrls = {
@@ -341,7 +339,7 @@ static const unsigned char init_ov9650[][3] =
341 {SENSOR, OV9650_ACOM38, 0x81}, 339 {SENSOR, OV9650_ACOM38, 0x81},
342 /* Turn off color matrix coefficient double option */ 340 /* Turn off color matrix coefficient double option */
343 {SENSOR, OV9650_COM16, 0x00}, 341 {SENSOR, OV9650_COM16, 0x00},
344 /* Enable color matrix for RGB/YUV, Delay Y channel, 342 /* Enable color matrix for RGB/YUV, Delay Y channel,
345 set output Y/UV delay to 1 */ 343 set output Y/UV delay to 1 */
346 {SENSOR, OV9650_COM13, 0x19}, 344 {SENSOR, OV9650_COM13, 0x19},
347 /* Enable digital BLC, Set output mode to U Y V Y */ 345 /* 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 1ee649b8d63..701d30292ac 100644
--- 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 = {
86 .probe = s5k4aa_probe, 86 .probe = s5k4aa_probe,
87 .init = s5k4aa_init, 87 .init = s5k4aa_init,
88 .power_down = s5k4aa_power_down, 88 .power_down = s5k4aa_power_down,
89 .read_sensor = s5k4aa_read_sensor,
90 .write_sensor = s5k4aa_write_sensor,
91 .i2c_slave_id = 0x5a, 89 .i2c_slave_id = 0x5a,
92 .nctrls = 4, 90 .nctrls = 4,
93 .ctrls = { 91 .ctrls = {
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
index 5080da19610..793c967875d 100644
--- 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 = {
68 .probe = s5k83a_probe, 68 .probe = s5k83a_probe,
69 .init = s5k83a_init, 69 .init = s5k83a_init,
70 .power_down = s5k83a_power_down, 70 .power_down = s5k83a_power_down,
71 .read_sensor = s5k83a_read_sensor,
72 .write_sensor = s5k83a_write_sensor,
73 .i2c_slave_id = 0x5a, 71 .i2c_slave_id = 0x5a,
74 .nctrls = 5, 72 .nctrls = 5,
75 .ctrls = { 73 .ctrls = {
diff --git a/drivers/media/video/gspca/m5602/m5602_sensor.h b/drivers/media/video/gspca/m5602/m5602_sensor.h
index 60c9a48e0c0..c0900023680 100644
--- 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 {
58 /* Performs a power down sequence */ 58 /* Performs a power down sequence */
59 int (*power_down)(struct sd *sd); 59 int (*power_down)(struct sd *sd);
60 60
61 /* Reads a sensor register */
62 int (*read_sensor)(struct sd *sd, const u8 address,
63 u8 *i2c_data, const u8 len);
64
65 /* Writes to a sensor register */
66 int (*write_sensor)(struct sd *sd, const u8 address,
67 u8 *i2c_data, const u8 len);
68
69 int nctrls; 61 int nctrls;
70 struct ctrl ctrls[M5602_MAX_CTRLS]; 62 struct ctrl ctrls[M5602_MAX_CTRLS];
71 63