aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-09-28 14:47:21 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 13:34:51 -0200
commit6cf2a10180e4039aaad1e4ecba5f2520f157da40 (patch)
tree2801e8cb2c1ff2173292e60f59cd72047a6aadee /drivers/media
parent94a47dc4335a614eba30cf29aa3a953040625c92 (diff)
V4L/DVB (5133): M920x: move qt1010_tuner_attach function into qt1010.h
The megasky_tuner_attach function is not specific to this device. This patch renames it to qt1010_tuner_attach and moves it into the qt1010 header file. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/m920x.c11
-rw-r--r--drivers/media/dvb/frontends/qt1010.h8
2 files changed, 9 insertions, 10 deletions
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index 9e5ec080529..ba5332676b4 100644
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -246,15 +246,6 @@ static int megasky_frontend_attach(struct dvb_usb_adapter *adap)
return -EIO;
}
-static int megasky_tuner_attach(struct dvb_usb_adapter *adap)
-{
- adap->pll_addr = 0xc4;
- adap->pll_desc = NULL;
- adap->fe->ops.tuner_ops.set_params = qt1010_set_params;
-
- return 0;
-}
-
static int m9206_set_filter(struct dvb_usb_adapter *adap, int type, int idx, int pid)
{
int ret = 0;
@@ -452,7 +443,7 @@ static struct dvb_usb_device_properties megasky_properties = {
.pid_filter_ctrl = m9206_pid_filter_ctrl,
.frontend_attach = megasky_frontend_attach,
- .tuner_attach = megasky_tuner_attach,
+ .tuner_attach = qt1010_tuner_attach,
.stream = {
.type = USB_BULK,
diff --git a/drivers/media/dvb/frontends/qt1010.h b/drivers/media/dvb/frontends/qt1010.h
index 3a566085fa3..59ee1cd03e3 100644
--- a/drivers/media/dvb/frontends/qt1010.h
+++ b/drivers/media/dvb/frontends/qt1010.h
@@ -215,4 +215,12 @@ static int qt1010_set_params(struct dvb_frontend *fe, struct dvb_frontend_parame
return 0;
}
+static int qt1010_tuner_attach(struct dvb_usb_adapter *adap)
+{
+ adap->pll_addr = 0xc4;
+ adap->pll_desc = NULL;
+ adap->fe->ops.tuner_ops.set_params = qt1010_set_params;
+
+ return 0;
+}
#endif