evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] dvb: Avoid warnings when compiled without the media controller

Browse source 
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c: In function ‘dvb_usbv2_adapter_dvb_exit’:
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c:531:25: warning: unused variable ‘d’ [-Wunused-variable]
  struct dvb_usb_device *d = adap_to_d(adap);
                         ^
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c:403:13: warning: ‘dvb_usbv2_media_device_register’ defined but not used [-Wunused-function]
 static void dvb_usbv2_media_device_register(struct dvb_usb_adapter *adap)

drivers/media/usb/dvb-usb/dvb-usb-dvb.c:97:13: warning: ‘dvb_usb_media_device_register’ defined but not used [-Wunused-function]
 static void dvb_usb_media_device_register(struct dvb_usb_adapter *adap)
             ^

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2015-03-02 10:53:46 -03:00
parent 480884b647
commit 872b9dbedd
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/common/siano/smsdvb-main.c
View file

@ -611,9 +611,9 @@ static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
static void smsdvb_media_device_unregister(struct smsdvb_client_t *client) static void smsdvb_media_device_unregister(struct smsdvb_client_t *client)
{ {
#ifdef CONFIG_MEDIA_CONTROLLER_DVB
struct smscore_device_t *coredev = client->coredev; struct smscore_device_t *coredev = client->coredev;
#ifdef CONFIG_MEDIA_CONTROLLER_DVB
if (!coredev->media_dev) if (!coredev->media_dev)
return; return;
media_device_unregister(coredev->media_dev); media_device_unregister(coredev->media_dev);

4
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
View file

@ -467,9 +467,7 @@ static int dvb_usbv2_adapter_dvb_init(struct dvb_usb_adapter *adap)
adap->dvb_adap.priv = adap; adap->dvb_adap.priv = adap;
#ifdef CONFIG_MEDIA_CONTROLLER_DVB
dvb_usbv2_media_device_register(adap); dvb_usbv2_media_device_register(adap);
#endif
if (d->props->read_mac_address) { if (d->props->read_mac_address) {
ret = d->props->read_mac_address(adap, ret = d->props->read_mac_address(adap,
@ -528,8 +526,6 @@ err_dvb_register_adapter:
static int dvb_usbv2_adapter_dvb_exit(struct dvb_usb_adapter *adap) static int dvb_usbv2_adapter_dvb_exit(struct dvb_usb_adapter *adap)
{ {
struct dvb_usb_device *d = adap_to_d(adap);
dev_dbg(&adap_to_d(adap)->udev->dev, "%s: adap=%d\n", __func__, dev_dbg(&adap_to_d(adap)->udev->dev, "%s: adap=%d\n", __func__,
adap->id); adap->id);

2
drivers/media/usb/dvb-usb/dvb-usb-dvb.c
View file

@ -153,9 +153,7 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums)
} }
adap->dvb_adap.priv = adap; adap->dvb_adap.priv = adap;
#ifdef CONFIG_MEDIA_CONTROLLER_DVB
dvb_usb_media_device_register(adap); dvb_usb_media_device_register(adap);
#endif
if (adap->dev->props.read_mac_address) { if (adap->dev->props.read_mac_address) {
if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0) if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0)