UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: bcm: led_control.c: Removed dead code 

This patch removes the never-entered else-block inside
blink_in_normal_bandwidth(). The condition of the preceding if statement
is always true.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Matthias Beyer 2014-06-23 21:18:24 +02:00 committed by Greg Kroah-Hartman
parent 60654a8417
commit ea20548a82
1 changed files with 37 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
drivers/staging/bcm/led_control.c
View File

@ -108,74 +108,50 @@ static INT blink_in_normal_bandwidth(struct bcm_mini_adapter *ad,
enum bcm_led_events currdriverstate,
ulong *timeout)
{
bool bBlinkBothLED = TRUE;
/*
* Blink Tx and Rx LED when both Tx and Rx is
* in normal bandwidth
* Assign minimum number of blinks of
* either Tx or Rx.
*/
if (bBlinkBothLED) {
/*
* Assign minimum number of blinks of
* either Tx or Rx.
*/
if (*num_of_time_tx > *num_of_time_rx)
*num_of_time = *num_of_time_rx;
else
*num_of_time = *num_of_time_tx;
if (*num_of_time > 0) {
/* Blink both Tx and Rx LEDs */
if (LED_Blink(ad, 1 << GPIO_Num_tx,
uiTxLedIndex, *timeout,
*num_of_time, currdriverstate)
== EVENT_SIGNALED)
return EVENT_SIGNALED;
if (*num_of_time_tx > *num_of_time_rx)
*num_of_time = *num_of_time_rx;
else
*num_of_time = *num_of_time_tx;
if (*num_of_time > 0) {
/* Blink both Tx and Rx LEDs */
if (LED_Blink(ad, 1 << GPIO_Num_tx,
uiTxLedIndex, *timeout,
*num_of_time, currdriverstate)
== EVENT_SIGNALED)
return EVENT_SIGNALED;
if (LED_Blink(ad, 1 << GPIO_Num_rx,
uiRxLedIndex, *timeout,
*num_of_time, currdriverstate)
== EVENT_SIGNALED)
return EVENT_SIGNALED;
if (LED_Blink(ad, 1 << GPIO_Num_rx,
uiRxLedIndex, *timeout,
*num_of_time, currdriverstate)
== EVENT_SIGNALED)
return EVENT_SIGNALED;
}
}
if (*num_of_time == *num_of_time_tx) {
/* Blink pending rate of Rx */
if (LED_Blink(ad, (1 << GPIO_Num_rx),
uiRxLedIndex, *timeout,
*num_of_time_rx - *num_of_time,
currdriverstate)
== EVENT_SIGNALED)
return EVENT_SIGNALED;
if (*num_of_time == *num_of_time_tx) {
/* Blink pending rate of Rx */
if (LED_Blink(ad, (1 << GPIO_Num_rx),
uiRxLedIndex, *timeout,
*num_of_time_rx - *num_of_time,
currdriverstate)
== EVENT_SIGNALED)
return EVENT_SIGNALED;
*num_of_time = *num_of_time_rx;
} else {
/* Blink pending rate of Tx */
if (LED_Blink(ad, 1 << GPIO_Num_tx,
uiTxLedIndex, *timeout,
*num_of_time_tx - *num_of_time,
currdriverstate)
== EVENT_SIGNALED)
return EVENT_SIGNALED;
*num_of_time = *num_of_time_tx;
}
*num_of_time = *num_of_time_rx;
} else {
if (*num_of_time == *num_of_time_tx) {
/* Blink pending rate of Rx */
if (LED_Blink(ad, 1 << GPIO_Num_tx,
uiTxLedIndex, *timeout,
*num_of_time, currdriverstate)
== EVENT_SIGNALED)
return EVENT_SIGNALED;
} else {
/* Blink pending rate of Tx */
if (LED_Blink(ad, 1 << GPIO_Num_rx,
uiRxLedIndex, *timeout,
*num_of_time, currdriverstate)
== EVENT_SIGNALED)
return EVENT_SIGNALED;
}
/* Blink pending rate of Tx */
if (LED_Blink(ad, 1 << GPIO_Num_tx,
uiTxLedIndex, *timeout,
*num_of_time_tx - *num_of_time,
currdriverstate)
== EVENT_SIGNALED)
return EVENT_SIGNALED;
*num_of_time = *num_of_time_tx;
}
return 0;