From: Mauro Carvalho Chehab Date: Mon, 2 Mar 2015 14:26:14 +0000 (-0300) Subject: [media] use a function for DVB media controller register X-Git-Tag: omap-for-v4.1/fixes-rc1~72^2~1^2~350 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89a2c1d60aa2cfcf4c9f194b4c923d72182be431;p=pandora-kernel.git [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 --- diff --git a/drivers/media/common/siano/smsdvb-main.c b/drivers/media/common/siano/smsdvb-main.c index c739725ca7ee..367b8e77feb8 100644 --- a/drivers/media/common/siano/smsdvb-main.c +++ b/drivers/media/common/siano/smsdvb-main.c @@ -1104,9 +1104,7 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev, pr_err("dvb_register_adapter() failed %d\n", rc); goto adapter_error; } -#ifdef CONFIG_MEDIA_CONTROLLER_DVB - client->adapter.mdev = coredev->media_dev; -#endif + dvb_register_media_controller(&client->adapter, coredev->media_dev); /* init dvb demux */ client->demux.dmx.capabilities = DMX_TS_FILTERING; Reading git-diff-tree failed