openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Erik Andr?n 2009-01-06 11:59:42 -03:00 committed by Mauro Carvalho Chehab
parent a594fb4866
commit 09a7480ec1
11 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/video/gspca/m5602/m5602_mt9m111.c
View File

@ -165,11 +165,6 @@ int mt9m111_init(struct sd *sd)
return (err < 0) ? err : 0;
}
int mt9m111_power_down(struct sd *sd)
{
return 0;
}
void mt9m111_disconnect(struct sd *sd)
{
sd->sensor = NULL;

2
drivers/media/video/gspca/m5602/m5602_mt9m111.h
View File

@ -85,7 +85,6 @@ extern int dump_sensor;
int mt9m111_probe(struct sd *sd);
int mt9m111_init(struct sd *sd);
int mt9m111_power_down(struct sd *sd);
void mt9m111_disconnect(struct sd *sd);
int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
@ -103,7 +102,6 @@ const static struct m5602_sensor mt9m111 = {
.probe = mt9m111_probe,
.init = mt9m111_init,
.power_down = mt9m111_power_down,
.disconnect = mt9m111_disconnect,
};

17
drivers/media/video/gspca/m5602/m5602_ov9650.c
View File

@ -467,26 +467,9 @@ int ov9650_stop(struct sd *sd)
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)
{
ov9650_stop(sd);
ov9650_power_down(sd);
sd->sensor = NULL;
kfree(sd->sensor_priv);

22
drivers/media/video/gspca/m5602/m5602_ov9650.h
View File

@ -137,7 +137,6 @@ int ov9650_probe(struct sd *sd);
int ov9650_init(struct sd *sd);
int ov9650_start(struct sd *sd);
int ov9650_stop(struct sd *sd);
int ov9650_power_down(struct sd *sd);
void ov9650_disconnect(struct sd *sd);
int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
@ -167,7 +166,6 @@ const static struct m5602_sensor ov9650 = {
.init = ov9650_init,
.start = ov9650_start,
.stop = ov9650_stop,
.power_down = ov9650_power_down,
.disconnect = ov9650_disconnect,
};
@ -312,26 +310,6 @@ static const unsigned char init_ov9650[][3] =
{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] =
{
{SENSOR, OV9650_COM2, OV9650_OUTPUT_DRIVE_2X},

5
drivers/media/video/gspca/m5602/m5602_po1030.c
View File

@ -397,11 +397,6 @@ int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)
return err;
}
int po1030_power_down(struct sd *sd)
{
return 0;
}
void po1030_disconnect(struct sd *sd)
{
sd->sensor = NULL;

2
drivers/media/video/gspca/m5602/m5602_po1030.h
View File

@ -126,7 +126,6 @@ extern int dump_sensor;
int po1030_probe(struct sd *sd);
int po1030_init(struct sd *sd);
int po1030_power_down(struct sd *sd);
void po1030_disconnect(struct sd *sd);
int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
@ -150,7 +149,6 @@ static const struct m5602_sensor po1030 = {
.probe = po1030_probe,
.init = po1030_init,
.power_down = po1030_power_down,
.disconnect = po1030_disconnect,
};

5
drivers/media/video/gspca/m5602/m5602_s5k4aa.c
View File

@ -308,11 +308,6 @@ int s5k4aa_init(struct sd *sd)
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)
{
struct sd *sd = (struct sd *) gspca_dev;

2
drivers/media/video/gspca/m5602/m5602_s5k4aa.h
View File

@ -66,7 +66,6 @@ extern int dump_sensor;
int s5k4aa_probe(struct sd *sd);
int s5k4aa_init(struct sd *sd);
int s5k4aa_start(struct sd *sd);
int s5k4aa_power_down(struct sd *sd);
void s5k4aa_disconnect(struct sd *sd);
int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
@ -86,7 +85,6 @@ static const struct m5602_sensor s5k4aa = {
.probe = s5k4aa_probe,
.init = s5k4aa_init,
.start = s5k4aa_start,
.power_down = s5k4aa_power_down,
.disconnect = s5k4aa_disconnect,
};

5
drivers/media/video/gspca/m5602/m5602_s5k83a.c
View File

@ -298,11 +298,6 @@ void s5k83a_disconnect(struct sd *sd)
kfree(sens_priv);
}
int s5k83a_power_down(struct sd *sd)
{
return 0;
}
int s5k83a_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;

2
drivers/media/video/gspca/m5602/m5602_s5k83a.h
View File

@ -47,7 +47,6 @@ int s5k83a_probe(struct sd *sd);
int s5k83a_init(struct sd *sd);
int s5k83a_start(struct sd *sd);
int s5k83a_stop(struct sd *sd);
int s5k83a_power_down(struct sd *sd);
void s5k83a_disconnect(struct sd *sd);
int s5k83a_set_gain(struct gspca_dev *gspca_dev, __s32 val);
@ -67,7 +66,6 @@ static const struct m5602_sensor s5k83a = {
.init = s5k83a_init,
.start = s5k83a_start,
.stop = s5k83a_stop,
.power_down = s5k83a_power_down,
.disconnect = s5k83a_disconnect,
.i2c_slave_id = 0x5a,
.i2c_regW = 2,

3
drivers/media/video/gspca/m5602/m5602_sensor.h
View File

@ -61,9 +61,6 @@ struct m5602_sensor {
/* Executed when the device is disconnected */
void (*disconnect)(struct sd *sd);
/* Performs a power down sequence */
int (*power_down)(struct sd *sd);
};
#endif