[media] gscpa_m5602: Convert to the control framework

[~andy/linux] / drivers / media / usb / gspca / m5602 / m5602_s5k83a.h

diff --git a/drivers/media/usb/gspca/m5602/m5602_s5k83a.h b/drivers/media/usb/gspca/m5602/m5602_s5k83a.h
index 79952247b534e029569a8d6c8eab4f7afe4590d9..d61b918228dfbede87aa28e64154d4b7605e03df 100644 (file)
--- a/drivers/media/usb/gspca/m5602/m5602_s5k83a.h
+++ b/drivers/media/usb/gspca/m5602/m5602_s5k83a.h
@@ -45,6 +45,7 @@ extern bool dump_sensor;
 
 int s5k83a_probe(struct sd *sd);
 int s5k83a_init(struct sd *sd);
+int s5k83a_init_controls(struct sd *sd);
 int s5k83a_start(struct sd *sd);
 int s5k83a_stop(struct sd *sd);
 void s5k83a_disconnect(struct sd *sd);
@@ -53,6 +54,7 @@ static const struct m5602_sensor s5k83a = {
        .name = "S5K83A",
        .probe = s5k83a_probe,
        .init = s5k83a_init,
+       .init_controls = s5k83a_init_controls,
        .start = s5k83a_start,
        .stop = s5k83a_stop,
        .disconnect = s5k83a_disconnect,
@@ -60,13 +62,6 @@ static const struct m5602_sensor s5k83a = {
        .i2c_regW = 2,
 };
 
-struct s5k83a_priv {
-       /* We use another thread periodically
-          probing the orientation of the camera */
-       struct task_struct *rotation_thread;
-       s32 *settings;
-};
-
 static const unsigned char preinit_s5k83a[][4] = {
        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},