diff options
| author | Antti Palosaari | 2012-06-12 06:05:20 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2012-08-04 12:56:30 +0200 |
| commit | 2d2b37c75a4f5eb919c10674a8c2f0f5a3ac40ec (patch) | |
| tree | 6a976666df721db7b6b66432edfbd319d9f5367c /drivers/media/dvb/dvb-usb/dvb_usb.h | |
| parent | [media] dvb_usb_v2: Cypress firmware download module (diff) | |
| download | kernel-qcow2-linux-2d2b37c75a4f5eb919c10674a8c2f0f5a3ac40ec.tar.gz kernel-qcow2-linux-2d2b37c75a4f5eb919c10674a8c2f0f5a3ac40ec.tar.xz kernel-qcow2-linux-2d2b37c75a4f5eb919c10674a8c2f0f5a3ac40ec.zip | |
[media] dvb_usb_v2: move few callbacks one level up
Move frontend_attach, tuner_attach, frontend_ctrl and streaming_ctrl
from adapter to device.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb_usb.h')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dvb_usb.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb.h b/drivers/media/dvb/dvb-usb/dvb_usb.h index 7e4832664f5d..fd6237a3a4ce 100644 --- a/drivers/media/dvb/dvb-usb/dvb_usb.h +++ b/drivers/media/dvb/dvb-usb/dvb_usb.h @@ -100,10 +100,6 @@ struct dvb_usb_adapter_properties { int (*pid_filter_ctrl) (struct dvb_usb_adapter *, int); int (*pid_filter) (struct dvb_usb_adapter *, int, u16, int); - int (*frontend_attach) (struct dvb_usb_adapter *); - int (*tuner_attach) (struct dvb_usb_adapter *); - int (*frontend_ctrl) (struct dvb_frontend *, int); - int (*streaming_ctrl) (struct dvb_usb_adapter *, int); int (*fe_ioctl_override) (struct dvb_frontend *, unsigned int, void *, unsigned int); @@ -189,7 +185,10 @@ struct dvb_usb_device_properties { int (*power_ctrl) (struct dvb_usb_device *, int); int (*read_config) (struct dvb_usb_device *d); int (*read_mac_address) (struct dvb_usb_device *, u8 []); - int (*tuner_attach) (struct dvb_frontend *); + int (*frontend_attach) (struct dvb_usb_adapter *); + int (*tuner_attach) (struct dvb_usb_adapter *); + int (*frontend_ctrl) (struct dvb_frontend *, int); + int (*streaming_ctrl) (struct dvb_usb_adapter *, int); #define WARM 0 #define COLD 1 |