diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-03-02 10:53:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-03-02 11:25:45 -0300 |
| commit | 872b9dbedd4040f4511c909a09d39330624f057b (patch) | |
| tree | 53d164614e90b65167b38e8f8b11733fe2c06a97 | |
| parent | 480884b647c7efecb904a9ed022ee533afb9cb80 (diff) | |
| download | linux-872b9dbedd4040f4511c909a09d39330624f057b.tar.bz2 | |
[media] dvb: Avoid warnings when compiled without the media controller
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>
| -rw-r--r-- | drivers/media/common/siano/smsdvb-main.c | 2 | ||||
| -rw-r--r-- | drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 4 | ||||
| -rw-r--r-- | drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/drivers/media/common/siano/smsdvb-main.c b/drivers/media/common/siano/smsdvb-main.c index 387db145d37e..c739725ca7ee 100644 --- a/drivers/media/common/siano/smsdvb-main.c +++ b/drivers/media/common/siano/smsdvb-main.c @@ -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) { +#ifdef CONFIG_MEDIA_CONTROLLER_DVB struct smscore_device_t *coredev = client->coredev; -#ifdef CONFIG_MEDIA_CONTROLLER_DVB if (!coredev->media_dev) return; media_device_unregister(coredev->media_dev); diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c index 08a3cd1c8b44..8bd08ba4f869 100644 --- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c +++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c @@ -467,9 +467,7 @@ static int dvb_usbv2_adapter_dvb_init(struct dvb_usb_adapter *adap) adap->dvb_adap.priv = adap; -#ifdef CONFIG_MEDIA_CONTROLLER_DVB dvb_usbv2_media_device_register(adap); -#endif if (d->props->read_mac_address) { 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) { - struct dvb_usb_device *d = adap_to_d(adap); - dev_dbg(&adap_to_d(adap)->udev->dev, "%s: adap=%d\n", __func__, adap->id); diff --git a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c index 6c9f5ecf949c..980d976960d9 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c @@ -153,9 +153,7 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums) } adap->dvb_adap.priv = adap; -#ifdef CONFIG_MEDIA_CONTROLLER_DVB dvb_usb_media_device_register(adap); -#endif if (adap->dev->props.read_mac_address) { if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0) |