diff options
author | Luis R. Rodriguez <mcgrof@suse.com> | 2014-04-17 21:24:43 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-23 18:47:43 -0400 |
commit | fff287bb22fd8113fa086114037df4b07e2f69de (patch) | |
tree | 67a69c6f64b8c2f9df41bf990a42179adfc4ed5d | |
parent | 3eb51f5ec0dc9dfaa08bb8a376c2379c8a26d0d1 (diff) |
[media] technisat-usb2: rename led enums to be specific to driver
The current names clash with include/linux/leds.h namespace,
although there is no compile issue currently this does affect
backports. Drivers should also try to avoid generic namespaces
for things like this.
Cc: Felipe Pena <felipensp@gmail.com>
Cc: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | drivers/media/usb/dvb-usb/technisat-usb2.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c index 98d24aefb640..d947e0379008 100644 --- a/drivers/media/usb/dvb-usb/technisat-usb2.c +++ b/drivers/media/usb/dvb-usb/technisat-usb2.c | |||
@@ -214,10 +214,10 @@ static void technisat_usb2_frontend_reset(struct usb_device *udev) | |||
214 | 214 | ||
215 | /* LED control */ | 215 | /* LED control */ |
216 | enum technisat_usb2_led_state { | 216 | enum technisat_usb2_led_state { |
217 | LED_OFF, | 217 | TECH_LED_OFF, |
218 | LED_BLINK, | 218 | TECH_LED_BLINK, |
219 | LED_ON, | 219 | TECH_LED_ON, |
220 | LED_UNDEFINED | 220 | TECH_LED_UNDEFINED |
221 | }; | 221 | }; |
222 | 222 | ||
223 | static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum technisat_usb2_led_state state) | 223 | static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum technisat_usb2_led_state state) |
@@ -229,14 +229,14 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni | |||
229 | 0 | 229 | 0 |
230 | }; | 230 | }; |
231 | 231 | ||
232 | if (disable_led_control && state != LED_OFF) | 232 | if (disable_led_control && state != TECH_LED_OFF) |
233 | return 0; | 233 | return 0; |
234 | 234 | ||
235 | switch (state) { | 235 | switch (state) { |
236 | case LED_ON: | 236 | case TECH_LED_ON: |
237 | led[1] = 0x82; | 237 | led[1] = 0x82; |
238 | break; | 238 | break; |
239 | case LED_BLINK: | 239 | case TECH_LED_BLINK: |
240 | led[1] = 0x82; | 240 | led[1] = 0x82; |
241 | if (red) { | 241 | if (red) { |
242 | led[2] = 0x02; | 242 | led[2] = 0x02; |
@@ -251,7 +251,7 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni | |||
251 | break; | 251 | break; |
252 | 252 | ||
253 | default: | 253 | default: |
254 | case LED_OFF: | 254 | case TECH_LED_OFF: |
255 | led[1] = 0x80; | 255 | led[1] = 0x80; |
256 | break; | 256 | break; |
257 | } | 257 | } |
@@ -310,11 +310,11 @@ static void technisat_usb2_green_led_control(struct work_struct *work) | |||
310 | goto schedule; | 310 | goto schedule; |
311 | 311 | ||
312 | if (ber > 1000) | 312 | if (ber > 1000) |
313 | technisat_usb2_set_led(state->dev, 0, LED_BLINK); | 313 | technisat_usb2_set_led(state->dev, 0, TECH_LED_BLINK); |
314 | else | 314 | else |
315 | technisat_usb2_set_led(state->dev, 0, LED_ON); | 315 | technisat_usb2_set_led(state->dev, 0, TECH_LED_ON); |
316 | } else | 316 | } else |
317 | technisat_usb2_set_led(state->dev, 0, LED_OFF); | 317 | technisat_usb2_set_led(state->dev, 0, TECH_LED_OFF); |
318 | } | 318 | } |
319 | 319 | ||
320 | schedule: | 320 | schedule: |
@@ -365,9 +365,9 @@ static int technisat_usb2_power_ctrl(struct dvb_usb_device *d, int level) | |||
365 | return 0; | 365 | return 0; |
366 | 366 | ||
367 | /* green led is turned off in any case - will be turned on when tuning */ | 367 | /* green led is turned off in any case - will be turned on when tuning */ |
368 | technisat_usb2_set_led(d, 0, LED_OFF); | 368 | technisat_usb2_set_led(d, 0, TECH_LED_OFF); |
369 | /* red led is turned on all the time */ | 369 | /* red led is turned on all the time */ |
370 | technisat_usb2_set_led(d, 1, LED_ON); | 370 | technisat_usb2_set_led(d, 1, TECH_LED_ON); |
371 | return 0; | 371 | return 0; |
372 | } | 372 | } |
373 | 373 | ||
@@ -667,7 +667,7 @@ static int technisat_usb2_rc_query(struct dvb_usb_device *d) | |||
667 | return 0; | 667 | return 0; |
668 | 668 | ||
669 | if (!disable_led_control) | 669 | if (!disable_led_control) |
670 | technisat_usb2_set_led(d, 1, LED_BLINK); | 670 | technisat_usb2_set_led(d, 1, TECH_LED_BLINK); |
671 | 671 | ||
672 | return 0; | 672 | return 0; |
673 | } | 673 | } |