1 files changed, 0 insertions, 69 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
index d56eb4c5ee3..9b9450fbd3d 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k83a.h
+++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
@@ -61,74 +61,6 @@ int s5k83a_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
 int s5k83a_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
 int s5k83a_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
-static struct ctrl s5k83a_ctrls[] = {
-        {
-                {
-                        .id = V4L2_CID_BRIGHTNESS,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "brightness",
-                        .minimum = 0x00,
-                        .maximum = 0xff,
-                        .step = 0x01,
-                        .default_value = S5K83A_DEFAULT_BRIGHTNESS,
-                        .flags = V4L2_CTRL_FLAG_SLIDER
-                },
-                        .set = s5k83a_set_brightness,
-                        .get = s5k83a_get_brightness
-        }, {
-                {
-                        .id = V4L2_CID_WHITENESS,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "whiteness",
-                        .minimum = 0x00,
-                        .maximum = 0xff,
-                        .step = 0x01,
-                        .default_value = S5K83A_DEFAULT_WHITENESS,
-                        .flags = V4L2_CTRL_FLAG_SLIDER
-                },
-                        .set = s5k83a_set_whiteness,
-                        .get = s5k83a_get_whiteness,
-        }, {
-                {
-                        .id = V4L2_CID_GAIN,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "gain",
-                        .minimum = 0x00,
-                        .maximum = S5K83A_MAXIMUM_GAIN,
-                        .step = 0x01,
-                        .default_value = S5K83A_DEFAULT_GAIN,
-                        .flags = V4L2_CTRL_FLAG_SLIDER
-                },
-                        .set = s5k83a_set_gain,
-                        .get = s5k83a_get_gain
-        }, {
-                {
-                        .id         = V4L2_CID_HFLIP,
-                        .type       = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name       = "horizontal flip",
-                        .minimum    = 0,
-                        .maximum    = 1,
-                        .step       = 1,
-                        .default_value  = 0
-                },
-                        .set = s5k83a_set_hflip,
-                        .get = s5k83a_get_hflip
-        }, {
-                {
-                 .id         = V4L2_CID_VFLIP,
-                .type       = V4L2_CTRL_TYPE_BOOLEAN,
-                .name       = "vertical flip",
-                .minimum    = 0,
-                .maximum    = 1,
-                .step       = 1,
-                .default_value  = 0
-                },
-                .set = s5k83a_set_vflip,
-                .get = s5k83a_get_vflip
-        }
-};
 static struct m5602_sensor s5k83a = {
        .name = "S5K83A",
        .probe = s5k83a_probe,
@@ -138,7 +70,6 @@ static struct m5602_sensor s5k83a = {
        .power_down = s5k83a_power_down,
        .i2c_slave_id = 0x5a,
        .i2c_regW = 2,
-        .ctrls = s5k83a_ctrls,
 };
 static const unsigned char preinit_s5k83a[][4] =

diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/drivers/media/video/gspca/m5602/m5602_s5k83a.h index d56eb4c5ee3..9b9450fbd3d 100644 --- a/drivers/media/video/gspca/m5602/m5602_s5k83a.h +++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
@@ -61,74 +61,6 @@ int s5k83a_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
61	int s5k83a_get_hflip(struct gspca_dev gspca_dev, __s32 val);	61	int s5k83a_get_hflip(struct gspca_dev gspca_dev, __s32 val);
62	int s5k83a_set_hflip(struct gspca_dev *gspca_dev, __s32 val);	62	int s5k83a_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
63		63
64	static struct ctrl s5k83a_ctrls[] = {
65	{
66	{
67	.id = V4L2_CID_BRIGHTNESS,
68	.type = V4L2_CTRL_TYPE_INTEGER,
69	.name = "brightness",
70	.minimum = 0x00,
71	.maximum = 0xff,
72	.step = 0x01,
73	.default_value = S5K83A_DEFAULT_BRIGHTNESS,
74	.flags = V4L2_CTRL_FLAG_SLIDER
75	},
76	.set = s5k83a_set_brightness,
77	.get = s5k83a_get_brightness
78
79	}, {
80	{
81	.id = V4L2_CID_WHITENESS,
82	.type = V4L2_CTRL_TYPE_INTEGER,
83	.name = "whiteness",
84	.minimum = 0x00,
85	.maximum = 0xff,
86	.step = 0x01,
87	.default_value = S5K83A_DEFAULT_WHITENESS,
88	.flags = V4L2_CTRL_FLAG_SLIDER
89	},
90	.set = s5k83a_set_whiteness,
91	.get = s5k83a_get_whiteness,
92	}, {
93	{
94	.id = V4L2_CID_GAIN,
95	.type = V4L2_CTRL_TYPE_INTEGER,
96	.name = "gain",
97	.minimum = 0x00,
98	.maximum = S5K83A_MAXIMUM_GAIN,
99	.step = 0x01,
100	.default_value = S5K83A_DEFAULT_GAIN,
101	.flags = V4L2_CTRL_FLAG_SLIDER
102	},
103	.set = s5k83a_set_gain,
104	.get = s5k83a_get_gain
105	}, {
106	{
107	.id = V4L2_CID_HFLIP,
108	.type = V4L2_CTRL_TYPE_BOOLEAN,
109	.name = "horizontal flip",
110	.minimum = 0,
111	.maximum = 1,
112	.step = 1,
113	.default_value = 0
114	},
115	.set = s5k83a_set_hflip,
116	.get = s5k83a_get_hflip
117	}, {
118	{
119	.id = V4L2_CID_VFLIP,
120	.type = V4L2_CTRL_TYPE_BOOLEAN,
121	.name = "vertical flip",
122	.minimum = 0,
123	.maximum = 1,
124	.step = 1,
125	.default_value = 0
126	},
127	.set = s5k83a_set_vflip,
128	.get = s5k83a_get_vflip
129	}
130	};
131
132	static struct m5602_sensor s5k83a = {	64	static struct m5602_sensor s5k83a = {
133	.name = "S5K83A",	65	.name = "S5K83A",
134	.probe = s5k83a_probe,	66	.probe = s5k83a_probe,
@@ -138,7 +70,6 @@ static struct m5602_sensor s5k83a = {
138	.power_down = s5k83a_power_down,	70	.power_down = s5k83a_power_down,
139	.i2c_slave_id = 0x5a,	71	.i2c_slave_id = 0x5a,
140	.i2c_regW = 2,	72	.i2c_regW = 2,
141	.ctrls = s5k83a_ctrls,
142	};	73	};
143		74
144	static const unsigned char preinit_s5k83a[][4] =	75	static const unsigned char preinit_s5k83a[][4] =