diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-03-23 06:30:38 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-05-07 10:46:42 -0400 |
commit | e8e20f1f02eb34b4d446101547159418346b65d4 (patch) | |
tree | c4569d5b237237e3fbf0efecd8cebf931480f883 | |
parent | c64ee34712eeeee95de0376f424dd4dc7661d3ed (diff) |
[media] dvb-usb: hide unused functions
A couple of data structures in the dibusb-common file are only
accessed when CONFIG_DVB_DIB3000MC is enabled, otherwise we
get a harmless gcc warning:
usb/dvb-usb/dibusb-common.c:223:34: error: 'dib3000p_panasonic_agc_config' defined but not used
usb/dvb-usb/dibusb-common.c:211:32: error: 'stk3000p_dib3000p_config' defined but not used
This moves the existing #ifdef a few lines up to correctly cover
all the conditional data structures, which gets rid of the warning.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | drivers/media/usb/dvb-usb/dibusb-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/dvb-usb/dibusb-common.c b/drivers/media/usb/dvb-usb/dibusb-common.c index 35de6095926d..6eea4e68891d 100644 --- a/drivers/media/usb/dvb-usb/dibusb-common.c +++ b/drivers/media/usb/dvb-usb/dibusb-common.c | |||
@@ -184,6 +184,8 @@ int dibusb_read_eeprom_byte(struct dvb_usb_device *d, u8 offs, u8 *val) | |||
184 | } | 184 | } |
185 | EXPORT_SYMBOL(dibusb_read_eeprom_byte); | 185 | EXPORT_SYMBOL(dibusb_read_eeprom_byte); |
186 | 186 | ||
187 | #if IS_ENABLED(CONFIG_DVB_DIB3000MC) | ||
188 | |||
187 | /* 3000MC/P stuff */ | 189 | /* 3000MC/P stuff */ |
188 | // Config Adjacent channels Perf -cal22 | 190 | // Config Adjacent channels Perf -cal22 |
189 | static struct dibx000_agc_config dib3000p_mt2060_agc_config = { | 191 | static struct dibx000_agc_config dib3000p_mt2060_agc_config = { |
@@ -242,8 +244,6 @@ static struct dibx000_agc_config dib3000p_panasonic_agc_config = { | |||
242 | .agc2_slope2 = 0x1e, | 244 | .agc2_slope2 = 0x1e, |
243 | }; | 245 | }; |
244 | 246 | ||
245 | #if IS_ENABLED(CONFIG_DVB_DIB3000MC) | ||
246 | |||
247 | static struct dib3000mc_config mod3000p_dib3000p_config = { | 247 | static struct dib3000mc_config mod3000p_dib3000p_config = { |
248 | &dib3000p_panasonic_agc_config, | 248 | &dib3000p_panasonic_agc_config, |
249 | 249 | ||