Skip to content

Commit

Permalink
rt2x00: Make rt2x00leds_register return void
Browse files Browse the repository at this point in the history
rt2x00dev isn't interested in the rt2x00leds_register() value
anyway. So lets make it return void to even prevent people from
assuming there is anybody interested in the returnvalue.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Ivo van Doorn authored and John W. Linville committed Mar 13, 2008
1 parent 7281037 commit 72fa559
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
7 changes: 3 additions & 4 deletions drivers/net/wireless/rt2x00/rt2x00leds.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,15 @@ static int rt2x00leds_register_led(struct rt2x00_dev *rt2x00dev,
return 0;
}

int rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
void rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
{
char *trigger;
char dev_name[16];
char name[32];
int retval;

if (!rt2x00dev->ops->lib->led_brightness)
return 0;
return;

snprintf(dev_name, sizeof(dev_name), "%s-%s",
rt2x00dev->ops->name, wiphy_name(rt2x00dev->hw->wiphy));
Expand Down Expand Up @@ -161,11 +161,10 @@ int rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
goto exit_fail;
}

return 0;
return;

exit_fail:
rt2x00leds_unregister(rt2x00dev);
return retval;
}

static void rt2x00leds_unregister_trigger(struct rt2x00_trigger *trigger)
Expand Down
5 changes: 2 additions & 3 deletions drivers/net/wireless/rt2x00/rt2x00lib.h
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ static inline void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
*/
#ifdef CONFIG_RT2X00_LIB_LEDS
void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev, int rssi);
int rt2x00leds_register(struct rt2x00_dev *rt2x00dev);
void rt2x00leds_register(struct rt2x00_dev *rt2x00dev);
void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev);
void rt2x00leds_suspend(struct rt2x00_dev *rt2x00dev);
void rt2x00leds_resume(struct rt2x00_dev *rt2x00dev);
Expand All @@ -199,9 +199,8 @@ static inline void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev,
{
}

static inline int rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
static inline void rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
{
return 0;
}

static inline void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev)
Expand Down

0 comments on commit 72fa559

Please sign in to comment.