Commit 09a7480e authored by Erik Andr?n's avatar Erik Andr?n Committed by Mauro Carvalho Chehab

V4L/DVB (11454): gspca - m5602-mt9m111: Remove the unused power_down struct member

The power_down sensor struct member is almost has no purpose in the current driver abstraction. Remove it.
Signed-off-by: default avatarErik Andr?n <erik.andren@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a594fb48
...@@ -165,11 +165,6 @@ int mt9m111_init(struct sd *sd) ...@@ -165,11 +165,6 @@ int mt9m111_init(struct sd *sd)
return (err < 0) ? err : 0; return (err < 0) ? err : 0;
} }
int mt9m111_power_down(struct sd *sd)
{
return 0;
}
void mt9m111_disconnect(struct sd *sd) void mt9m111_disconnect(struct sd *sd)
{ {
sd->sensor = NULL; sd->sensor = NULL;
......
...@@ -85,7 +85,6 @@ extern int dump_sensor; ...@@ -85,7 +85,6 @@ extern int dump_sensor;
int mt9m111_probe(struct sd *sd); int mt9m111_probe(struct sd *sd);
int mt9m111_init(struct sd *sd); int mt9m111_init(struct sd *sd);
int mt9m111_power_down(struct sd *sd);
void mt9m111_disconnect(struct sd *sd); void mt9m111_disconnect(struct sd *sd);
int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val); int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
...@@ -103,7 +102,6 @@ const static struct m5602_sensor mt9m111 = { ...@@ -103,7 +102,6 @@ const static struct m5602_sensor mt9m111 = {
.probe = mt9m111_probe, .probe = mt9m111_probe,
.init = mt9m111_init, .init = mt9m111_init,
.power_down = mt9m111_power_down,
.disconnect = mt9m111_disconnect, .disconnect = mt9m111_disconnect,
}; };
......
...@@ -467,26 +467,9 @@ int ov9650_stop(struct sd *sd) ...@@ -467,26 +467,9 @@ int ov9650_stop(struct sd *sd)
return m5602_write_sensor(sd, OV9650_COM2, &data, 1); return m5602_write_sensor(sd, OV9650_COM2, &data, 1);
} }
int ov9650_power_down(struct sd *sd)
{
int i, err = 0;
for (i = 0; i < ARRAY_SIZE(power_down_ov9650) && !err; i++) {
u8 data = power_down_ov9650[i][2];
if (power_down_ov9650[i][0] == SENSOR)
err = m5602_write_sensor(sd,
power_down_ov9650[i][1], &data, 1);
else
err = m5602_write_bridge(sd, power_down_ov9650[i][1],
data);
}
return err;
}
void ov9650_disconnect(struct sd *sd) void ov9650_disconnect(struct sd *sd)
{ {
ov9650_stop(sd); ov9650_stop(sd);
ov9650_power_down(sd);
sd->sensor = NULL; sd->sensor = NULL;
kfree(sd->sensor_priv); kfree(sd->sensor_priv);
......
...@@ -137,7 +137,6 @@ int ov9650_probe(struct sd *sd); ...@@ -137,7 +137,6 @@ int ov9650_probe(struct sd *sd);
int ov9650_init(struct sd *sd); int ov9650_init(struct sd *sd);
int ov9650_start(struct sd *sd); int ov9650_start(struct sd *sd);
int ov9650_stop(struct sd *sd); int ov9650_stop(struct sd *sd);
int ov9650_power_down(struct sd *sd);
void ov9650_disconnect(struct sd *sd); void ov9650_disconnect(struct sd *sd);
int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val); int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
...@@ -167,7 +166,6 @@ const static struct m5602_sensor ov9650 = { ...@@ -167,7 +166,6 @@ const static struct m5602_sensor ov9650 = {
.init = ov9650_init, .init = ov9650_init,
.start = ov9650_start, .start = ov9650_start,
.stop = ov9650_stop, .stop = ov9650_stop,
.power_down = ov9650_power_down,
.disconnect = ov9650_disconnect, .disconnect = ov9650_disconnect,
}; };
...@@ -312,26 +310,6 @@ static const unsigned char init_ov9650[][3] = ...@@ -312,26 +310,6 @@ static const unsigned char init_ov9650[][3] =
{SENSOR, OV9650_COM2, OV9650_SOFT_SLEEP | OV9650_OUTPUT_DRIVE_2X}, {SENSOR, OV9650_COM2, OV9650_SOFT_SLEEP | OV9650_OUTPUT_DRIVE_2X},
}; };
static const unsigned char power_down_ov9650[][3] =
{
{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
{SENSOR, OV9650_COM7, 0x80},
{SENSOR, OV9650_OFON, 0xf4},
{SENSOR, OV9650_MVFP, 0x80},
{SENSOR, OV9650_DBLV, 0x3f},
{SENSOR, OV9650_RSVD36, 0x49},
{SENSOR, OV9650_COM7, 0x05},
{BRIDGE, M5602_XB_GPIO_DIR, 0x05},
{BRIDGE, M5602_XB_GPIO_DAT, 0x04},
{BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
{BRIDGE, M5602_XB_GPIO_EN_L, 0x06},
{BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
};
static const unsigned char res_init_ov9650[][3] = static const unsigned char res_init_ov9650[][3] =
{ {
{SENSOR, OV9650_COM2, OV9650_OUTPUT_DRIVE_2X}, {SENSOR, OV9650_COM2, OV9650_OUTPUT_DRIVE_2X},
......
...@@ -397,11 +397,6 @@ int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val) ...@@ -397,11 +397,6 @@ int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)
return err; return err;
} }
int po1030_power_down(struct sd *sd)
{
return 0;
}
void po1030_disconnect(struct sd *sd) void po1030_disconnect(struct sd *sd)
{ {
sd->sensor = NULL; sd->sensor = NULL;
......
...@@ -126,7 +126,6 @@ extern int dump_sensor; ...@@ -126,7 +126,6 @@ extern int dump_sensor;
int po1030_probe(struct sd *sd); int po1030_probe(struct sd *sd);
int po1030_init(struct sd *sd); int po1030_init(struct sd *sd);
int po1030_power_down(struct sd *sd);
void po1030_disconnect(struct sd *sd); void po1030_disconnect(struct sd *sd);
int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val); int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
...@@ -150,7 +149,6 @@ static const struct m5602_sensor po1030 = { ...@@ -150,7 +149,6 @@ static const struct m5602_sensor po1030 = {
.probe = po1030_probe, .probe = po1030_probe,
.init = po1030_init, .init = po1030_init,
.power_down = po1030_power_down,
.disconnect = po1030_disconnect, .disconnect = po1030_disconnect,
}; };
......
...@@ -308,11 +308,6 @@ int s5k4aa_init(struct sd *sd) ...@@ -308,11 +308,6 @@ int s5k4aa_init(struct sd *sd)
return (err < 0) ? err : 0; return (err < 0) ? err : 0;
} }
int s5k4aa_power_down(struct sd *sd)
{
return 0;
}
int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val) int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
......
...@@ -66,7 +66,6 @@ extern int dump_sensor; ...@@ -66,7 +66,6 @@ extern int dump_sensor;
int s5k4aa_probe(struct sd *sd); int s5k4aa_probe(struct sd *sd);
int s5k4aa_init(struct sd *sd); int s5k4aa_init(struct sd *sd);
int s5k4aa_start(struct sd *sd); int s5k4aa_start(struct sd *sd);
int s5k4aa_power_down(struct sd *sd);
void s5k4aa_disconnect(struct sd *sd); void s5k4aa_disconnect(struct sd *sd);
int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val); int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
...@@ -86,7 +85,6 @@ static const struct m5602_sensor s5k4aa = { ...@@ -86,7 +85,6 @@ static const struct m5602_sensor s5k4aa = {
.probe = s5k4aa_probe, .probe = s5k4aa_probe,
.init = s5k4aa_init, .init = s5k4aa_init,
.start = s5k4aa_start, .start = s5k4aa_start,
.power_down = s5k4aa_power_down,
.disconnect = s5k4aa_disconnect, .disconnect = s5k4aa_disconnect,
}; };
......
...@@ -298,11 +298,6 @@ void s5k83a_disconnect(struct sd *sd) ...@@ -298,11 +298,6 @@ void s5k83a_disconnect(struct sd *sd)
kfree(sens_priv); kfree(sens_priv);
} }
int s5k83a_power_down(struct sd *sd)
{
return 0;
}
int s5k83a_get_gain(struct gspca_dev *gspca_dev, __s32 *val) int s5k83a_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
......
...@@ -47,7 +47,6 @@ int s5k83a_probe(struct sd *sd); ...@@ -47,7 +47,6 @@ int s5k83a_probe(struct sd *sd);
int s5k83a_init(struct sd *sd); int s5k83a_init(struct sd *sd);
int s5k83a_start(struct sd *sd); int s5k83a_start(struct sd *sd);
int s5k83a_stop(struct sd *sd); int s5k83a_stop(struct sd *sd);
int s5k83a_power_down(struct sd *sd);
void s5k83a_disconnect(struct sd *sd); void s5k83a_disconnect(struct sd *sd);
int s5k83a_set_gain(struct gspca_dev *gspca_dev, __s32 val); int s5k83a_set_gain(struct gspca_dev *gspca_dev, __s32 val);
...@@ -67,7 +66,6 @@ static const struct m5602_sensor s5k83a = { ...@@ -67,7 +66,6 @@ static const struct m5602_sensor s5k83a = {
.init = s5k83a_init, .init = s5k83a_init,
.start = s5k83a_start, .start = s5k83a_start,
.stop = s5k83a_stop, .stop = s5k83a_stop,
.power_down = s5k83a_power_down,
.disconnect = s5k83a_disconnect, .disconnect = s5k83a_disconnect,
.i2c_slave_id = 0x5a, .i2c_slave_id = 0x5a,
.i2c_regW = 2, .i2c_regW = 2,
......
...@@ -61,9 +61,6 @@ struct m5602_sensor { ...@@ -61,9 +61,6 @@ struct m5602_sensor {
/* Executed when the device is disconnected */ /* Executed when the device is disconnected */
void (*disconnect)(struct sd *sd); void (*disconnect)(struct sd *sd);
/* Performs a power down sequence */
int (*power_down)(struct sd *sd);
}; };
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment