diff options
| author |   Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-03-02 11:26:14 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-03-02 11:29:39 -0300 |
| commit | 89a2c1d60aa2cfcf4c9f194b4c923d72182be431 (patch) | |
| tree | 7f459e266ff9e16a407f190cccc4180419828811 /drivers/media/usb/cx231xx | |
| parent | [media] dvb: Avoid warnings when compiled without the media controller (diff) | |
| download | linux-dev-89a2c1d60aa2cfcf4c9f194b4c923d72182be431.tar.xz linux-dev-89a2c1d60aa2cfcf4c9f194b4c923d72182be431.zip | |
[media] use a function for DVB media controller register
This is really a simple function, but using it avoids to have
if's inside the drivers.
Also, the kABI becomes a little more clearer.
This shouldn't generate any overhead, and the type check
will happen when compiling with MC DVB enabled.
So, let's do it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/cx231xx')
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-dvb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c index 8bf2baae387f..ff39bf22442d 100644 --- a/drivers/media/usb/cx231xx/cx231xx-dvb.c +++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c @@ -465,9 +465,7 @@ static int register_dvb(struct cx231xx_dvb *dvb, dev->name, result); goto fail_adapter; } -#ifdef CONFIG_MEDIA_CONTROLLER_DVB - dvb->adapter.mdev = dev->media_dev; -#endif + dvb_register_media_controller(&dvb->adapter, dev->media_dev); /* Ensure all frontends negotiate bus access */ dvb->frontend->ops.ts_bus_ctrl = cx231xx_dvb_bus_ctrl; |