iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V4L/DVB (11368): v4l2-subdev: move s_standby from core to tuner.

Browse Source 
s_standby is only used to put the tuner in powersaving mode, so move it
from core to tuner.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2009-04-01 03:49:59 -03:00 committed by Mauro Carvalho Chehab
parent 78a3b4db2e
commit 7c9fc9d50f
12 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/cx231xx/cx231xx-video.c
View File

@ -2125,7 +2125,7 @@ static int cx231xx_v4l2_close(struct file *filp)
} }
/* Save some power by putting tuner to sleep */ /* Save some power by putting tuner to sleep */
call_all(dev, core, s_standby, 0); call_all(dev, tuner, s_standby);
/* do this before setting alternate! */ /* do this before setting alternate! */
cx231xx_uninit_isoc(dev); cx231xx_uninit_isoc(dev);

2
drivers/media/video/cx23885/cx23885-core.c
View File

@ -875,7 +875,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
cx23885_i2c_register(&dev->i2c_bus[1]); cx23885_i2c_register(&dev->i2c_bus[1]);
cx23885_i2c_register(&dev->i2c_bus[2]); cx23885_i2c_register(&dev->i2c_bus[2]);
cx23885_card_setup(dev); cx23885_card_setup(dev);
call_all(dev, core, s_standby, 0); call_all(dev, tuner, s_standby);
cx23885_ir_init(dev); cx23885_ir_init(dev);
if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO) { if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO) {

2
drivers/media/video/cx23885/cx23885-dvb.c
View File

@ -673,7 +673,7 @@ static int dvb_register(struct cx23885_tsport *port)
fe0->dvb.frontend->callback = cx23885_tuner_callback; fe0->dvb.frontend->callback = cx23885_tuner_callback;
/* Put the analog decoder in standby to keep it quiet */ /* Put the analog decoder in standby to keep it quiet */
call_all(dev, core, s_standby, 0); call_all(dev, tuner, s_standby);
if (fe0->dvb.frontend->ops.analog_ops.standby) if (fe0->dvb.frontend->ops.analog_ops.standby)
fe0->dvb.frontend->ops.analog_ops.standby(fe0->dvb.frontend); fe0->dvb.frontend->ops.analog_ops.standby(fe0->dvb.frontend);

2
drivers/media/video/cx88/cx88-cards.c
View File

@ -3049,7 +3049,7 @@ static void cx88_card_setup(struct cx88_core *core)
ctl.fname); ctl.fname);
call_all(core, tuner, s_config, &xc2028_cfg); call_all(core, tuner, s_config, &xc2028_cfg);
} }
call_all(core, core, s_standby, 0); call_all(core, tuner, s_standby);
} }
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */

2
drivers/media/video/cx88/cx88-dvb.c
View File

@ -1168,7 +1168,7 @@ static int dvb_register(struct cx8802_dev *dev)
fe1->dvb.frontend->ops.ts_bus_ctrl = cx88_dvb_bus_ctrl; fe1->dvb.frontend->ops.ts_bus_ctrl = cx88_dvb_bus_ctrl;
/* Put the analog decoder in standby to keep it quiet */ /* Put the analog decoder in standby to keep it quiet */
call_all(core, core, s_standby, 0); call_all(core, tuner, s_standby);
/* register everything */ /* register everything */
return videobuf_dvb_register_bus(&dev->frontends, THIS_MODULE, dev, return videobuf_dvb_register_bus(&dev->frontends, THIS_MODULE, dev,

2
drivers/media/video/cx88/cx88-video.c
View File

@ -931,7 +931,7 @@ static int video_release(struct file *file)
kfree(fh); kfree(fh);
if(atomic_dec_and_test(&dev->core->users)) if(atomic_dec_and_test(&dev->core->users))
call_all(dev->core, core, s_standby, 0); call_all(dev->core, tuner, s_standby);
return 0; return 0;
} }

2
drivers/media/video/em28xx/em28xx-cards.c
View File

@ -2162,7 +2162,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
em28xx_init_extension(dev); em28xx_init_extension(dev);
/* Save some power by putting tuner to sleep */ /* Save some power by putting tuner to sleep */
v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_standby, 0); v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_standby);
return 0; return 0;

2
drivers/media/video/em28xx/em28xx-video.c
View File

@ -1737,7 +1737,7 @@ static int em28xx_v4l2_close(struct file *filp)
} }
/* Save some power by putting tuner to sleep */ /* Save some power by putting tuner to sleep */
v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_standby, 0); v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_standby);
/* do this before setting alternate! */ /* do this before setting alternate! */
em28xx_uninit_isoc(dev); em28xx_uninit_isoc(dev);

2
drivers/media/video/saa7134/saa7134-core.c
View File

@ -1015,7 +1015,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
saa7134_irq_video_signalchange(dev); saa7134_irq_video_signalchange(dev);
if (TUNER_ABSENT != dev->tuner_type) if (TUNER_ABSENT != dev->tuner_type)
saa_call_all(dev, core, s_standby, 0); saa_call_all(dev, tuner, s_standby);
/* register v4l devices */ /* register v4l devices */
if (saa7134_no_overlay > 0) if (saa7134_no_overlay > 0)

2
drivers/media/video/saa7134/saa7134-video.c
View File

@ -1496,7 +1496,7 @@ static int video_release(struct file *file)
saa_andorb(SAA7134_OFMT_DATA_A, 0x1f, 0); saa_andorb(SAA7134_OFMT_DATA_A, 0x1f, 0);
saa_andorb(SAA7134_OFMT_DATA_B, 0x1f, 0); saa_andorb(SAA7134_OFMT_DATA_B, 0x1f, 0);
saa_call_all(dev, core, s_standby, 0); saa_call_all(dev, tuner, s_standby);
if (fh->radio) if (fh->radio)
saa_call_all(dev, core, ioctl, RDS_CMD_CLOSE, &cmd); saa_call_all(dev, core, ioctl, RDS_CMD_CLOSE, &cmd);

4
drivers/media/video/tuner-core.c
View File

@ -773,7 +773,7 @@ static int tuner_s_radio(struct v4l2_subdev *sd)
return 0; return 0;
} }
static int tuner_s_standby(struct v4l2_subdev *sd, u32 standby) static int tuner_s_standby(struct v4l2_subdev *sd)
{ {
struct tuner *t = to_tuner(sd); struct tuner *t = to_tuner(sd);
struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops; struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops;
@ -981,7 +981,6 @@ static int tuner_command(struct i2c_client *client, unsigned cmd, void *arg)
static const struct v4l2_subdev_core_ops tuner_core_ops = { static const struct v4l2_subdev_core_ops tuner_core_ops = {
.log_status = tuner_log_status, .log_status = tuner_log_status,
.s_standby = tuner_s_standby,
}; };
static const struct v4l2_subdev_tuner_ops tuner_tuner_ops = { static const struct v4l2_subdev_tuner_ops tuner_tuner_ops = {
@ -993,6 +992,7 @@ static const struct v4l2_subdev_tuner_ops tuner_tuner_ops = {
.g_frequency = tuner_g_frequency, .g_frequency = tuner_g_frequency,
.s_type_addr = tuner_s_type_addr, .s_type_addr = tuner_s_type_addr,
.s_config = tuner_s_config, .s_config = tuner_s_config,
.s_standby = tuner_s_standby,
}; };
static const struct v4l2_subdev_ops tuner_ops = { static const struct v4l2_subdev_ops tuner_ops = {

6
include/media/v4l2-subdev.h
View File

@ -96,14 +96,11 @@ struct v4l2_crystal_freq {
s_gpio: set GPIO pins. Very simple right now, might need to be extended with s_gpio: set GPIO pins. Very simple right now, might need to be extended with
a direction argument if needed. a direction argument if needed.
s_standby: puts tuner on powersaving state, disabling it, except for i2c.
*/ */
struct v4l2_subdev_core_ops { struct v4l2_subdev_core_ops {
int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip); int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip);
int (*log_status)(struct v4l2_subdev *sd); int (*log_status)(struct v4l2_subdev *sd);
int (*init)(struct v4l2_subdev *sd, u32 val); int (*init)(struct v4l2_subdev *sd, u32 val);
int (*s_standby)(struct v4l2_subdev *sd, u32 standby);
int (*reset)(struct v4l2_subdev *sd, u32 val); int (*reset)(struct v4l2_subdev *sd, u32 val);
int (*s_gpio)(struct v4l2_subdev *sd, u32 val); int (*s_gpio)(struct v4l2_subdev *sd, u32 val);
int (*queryctrl)(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc); int (*queryctrl)(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc);
@ -127,6 +124,8 @@ struct v4l2_subdev_core_ops {
s_type_addr: sets tuner type and its I2C addr. s_type_addr: sets tuner type and its I2C addr.
s_config: sets tda9887 specific stuff, like port1, port2 and qss s_config: sets tda9887 specific stuff, like port1, port2 and qss
s_standby: puts tuner on powersaving state, disabling it, except for i2c.
*/ */
struct v4l2_subdev_tuner_ops { struct v4l2_subdev_tuner_ops {
int (*s_mode)(struct v4l2_subdev *sd, enum v4l2_tuner_type); int (*s_mode)(struct v4l2_subdev *sd, enum v4l2_tuner_type);
@ -138,6 +137,7 @@ struct v4l2_subdev_tuner_ops {
int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm); int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm);
int (*s_type_addr)(struct v4l2_subdev *sd, struct tuner_setup *type); int (*s_type_addr)(struct v4l2_subdev *sd, struct tuner_setup *type);
int (*s_config)(struct v4l2_subdev *sd, const struct v4l2_priv_tun_config *config); int (*s_config)(struct v4l2_subdev *sd, const struct v4l2_priv_tun_config *config);
int (*s_standby)(struct v4l2_subdev *sd);
}; };
/* s_clock_freq: set the frequency (in Hz) of the audio clock output. /* s_clock_freq: set the frequency (in Hz) of the audio clock output.