Re: [PATCH] [media] use a function for DVB media controller register

["Tycho Lürsen" <tycholursen@gmail.com>]

Hi Mauro,
Op 02-03-15 om 18:06 schreef Mauro Carvalho Chehab:
> Em Mon, 02 Mar 2015 17:54:53 +0100
> Tycho Lürsen <tycholursen@gmail.com> escreveu:
>
>> Hi Mauro,
>> Op 02-03-15 om 15:31 schreef Mauro Carvalho Chehab:
>>> 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>
>>>
>>> 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;
>>> diff --git a/drivers/media/dvb-core/dvbdev.h b/drivers/media/dvb-core/dvbdev.h
>>> index 556c9e9d1d4e..12629b8ecb0c 100644
>>> --- a/drivers/media/dvb-core/dvbdev.h
>>> +++ b/drivers/media/dvb-core/dvbdev.h
>>> @@ -125,8 +125,15 @@ extern void dvb_unregister_device (struct dvb_device *dvbdev);
>>>    
>>>    #ifdef CONFIG_MEDIA_CONTROLLER_DVB
>>>    void dvb_create_media_graph(struct dvb_adapter *adap);
>>> +static inline void dvb_register_media_controller(struct dvb_adapter *adap,
>>> +						 struct media_device *mdev)
>>> +{
>>> +	adap->mdev = mdev;
>>> +}
>>> +
>>>    #else
>>>    static inline void dvb_create_media_graph(struct dvb_adapter *adap) {}
>>> +#define dvb_register_media_controller(a, b) {}
>>>    #endif
>> Does "#define dvb_register_media_controller(a, b) {}" restrict the
>> number of registerd controllers in any way?
>> I mean, I've got a couple of TBS quad adapters, 4 tuner and 4 demod
>> chips on each card. Will they still work with this change?
> No. What the above define does is to replace the function call by nothing,
> if MEDIA_CONTROLLER_DVB is not set.
>
> Neither it or the current patches for the media controller on DVB should
> affect the TBS quad adapters. If you're having some regressions with it,
> please report.
>
> Regards,
> Mauro
Thanks for your reply, I will test this for regression as soon as it 
hits the master branch.

Regards,
Tycho.