p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] rtl28xxu: simplify FE callback handling 

Logic is so simple that there is no idea to separate tuner selection to
own function, instead do it in a callback and get rid of one function.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Antti Palosaari 2014-12-17 03:09:32 -03:00 committed by Mauro Carvalho Chehab
parent 1dbbdceeb6
commit a6f62431a0
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/media/usb/dvb-usb-v2/rtl28xxu.c
View File

@ -721,22 +721,6 @@ static int rtl2832u_tua9001_tuner_callback(struct dvb_usb_device *d,
return ret; return ret;
} }
static int rtl2832u_tuner_callback(struct dvb_usb_device *d, int cmd, int arg)
{
struct rtl28xxu_priv *priv = d->priv;
switch (priv->tuner) {
case TUNER_RTL2832_FC0012:
return rtl2832u_fc0012_tuner_callback(d, cmd, arg);
case TUNER_RTL2832_TUA9001:
return rtl2832u_tua9001_tuner_callback(d, cmd, arg);
default:
break;
}
return 0;
}
static int rtl2832u_frontend_callback(void *adapter_priv, int component, static int rtl2832u_frontend_callback(void *adapter_priv, int component,
int cmd, int arg) int cmd, int arg)
{ {
@ -744,6 +728,7 @@ static int rtl2832u_frontend_callback(void *adapter_priv, int component,
struct device *parent = adapter->dev.parent; struct device *parent = adapter->dev.parent;
struct i2c_adapter *parent_adapter; struct i2c_adapter *parent_adapter;
struct dvb_usb_device *d; struct dvb_usb_device *d;
struct rtl28xxu_priv *priv;
/* /*
* All tuners are connected to demod muxed I2C adapter. We have to * All tuners are connected to demod muxed I2C adapter. We have to
@ -757,15 +742,21 @@ static int rtl2832u_frontend_callback(void *adapter_priv, int component,
return -EINVAL; return -EINVAL;
d = i2c_get_adapdata(parent_adapter); d = i2c_get_adapdata(parent_adapter);
priv = d->priv;
dev_dbg(&d->udev->dev, "%s: component=%d cmd=%d arg=%d\n", dev_dbg(&d->udev->dev, "%s: component=%d cmd=%d arg=%d\n",
__func__, component, cmd, arg); __func__, component, cmd, arg);
switch (component) { switch (component) {
case DVB_FRONTEND_COMPONENT_TUNER: case DVB_FRONTEND_COMPONENT_TUNER:
return rtl2832u_tuner_callback(d, cmd, arg); switch (priv->tuner) {
case TUNER_RTL2832_FC0012:
return rtl2832u_fc0012_tuner_callback(d, cmd, arg);
case TUNER_RTL2832_TUA9001:
return rtl2832u_tua9001_tuner_callback(d, cmd, arg);
}
default: default:
break; return -EINVAL;
} }
return 0; return 0;