diff options
| author | Ivo van Doorn <ivdoorn@gmail.com> | 2008-03-09 17:47:08 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-03-13 19:31:41 -0400 |
| commit | 72fa559bf44aab30ac5fc8317472ef3441f4aa64 (patch) | |
| tree | 1580c28cadcfc54e619d97c7b1c7ed09d08c2522 | |
| parent | 728103794316f7ff8d98bc2ce044aff7a260ee21 (diff) | |
rt2x00: Make rt2x00leds_register return void
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>
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00leds.c | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00lib.h | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00leds.c b/drivers/net/wireless/rt2x00/rt2x00leds.c index 9c29d17e0cc2..ca2d282a9f75 100644 --- a/drivers/net/wireless/rt2x00/rt2x00leds.c +++ b/drivers/net/wireless/rt2x00/rt2x00leds.c | |||
| @@ -109,7 +109,7 @@ static int rt2x00leds_register_led(struct rt2x00_dev *rt2x00dev, | |||
| 109 | return 0; | 109 | return 0; |
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | int rt2x00leds_register(struct rt2x00_dev *rt2x00dev) | 112 | void rt2x00leds_register(struct rt2x00_dev *rt2x00dev) |
| 113 | { | 113 | { |
| 114 | char *trigger; | 114 | char *trigger; |
| 115 | char dev_name[16]; | 115 | char dev_name[16]; |
| @@ -117,7 +117,7 @@ int rt2x00leds_register(struct rt2x00_dev *rt2x00dev) | |||
| 117 | int retval; | 117 | int retval; |
| 118 | 118 | ||
| 119 | if (!rt2x00dev->ops->lib->led_brightness) | 119 | if (!rt2x00dev->ops->lib->led_brightness) |
| 120 | return 0; | 120 | return; |
| 121 | 121 | ||
| 122 | snprintf(dev_name, sizeof(dev_name), "%s-%s", | 122 | snprintf(dev_name, sizeof(dev_name), "%s-%s", |
| 123 | rt2x00dev->ops->name, wiphy_name(rt2x00dev->hw->wiphy)); | 123 | rt2x00dev->ops->name, wiphy_name(rt2x00dev->hw->wiphy)); |
| @@ -161,11 +161,10 @@ int rt2x00leds_register(struct rt2x00_dev *rt2x00dev) | |||
| 161 | goto exit_fail; | 161 | goto exit_fail; |
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | return 0; | 164 | return; |
| 165 | 165 | ||
| 166 | exit_fail: | 166 | exit_fail: |
| 167 | rt2x00leds_unregister(rt2x00dev); | 167 | rt2x00leds_unregister(rt2x00dev); |
| 168 | return retval; | ||
| 169 | } | 168 | } |
| 170 | 169 | ||
| 171 | static void rt2x00leds_unregister_trigger(struct rt2x00_trigger *trigger) | 170 | static void rt2x00leds_unregister_trigger(struct rt2x00_trigger *trigger) |
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h index 6bd5a01ddfce..a15227d2fe40 100644 --- a/drivers/net/wireless/rt2x00/rt2x00lib.h +++ b/drivers/net/wireless/rt2x00/rt2x00lib.h | |||
| @@ -189,7 +189,7 @@ static inline void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev) | |||
| 189 | */ | 189 | */ |
| 190 | #ifdef CONFIG_RT2X00_LIB_LEDS | 190 | #ifdef CONFIG_RT2X00_LIB_LEDS |
| 191 | void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev, int rssi); | 191 | void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev, int rssi); |
| 192 | int rt2x00leds_register(struct rt2x00_dev *rt2x00dev); | 192 | void rt2x00leds_register(struct rt2x00_dev *rt2x00dev); |
| 193 | void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev); | 193 | void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev); |
| 194 | void rt2x00leds_suspend(struct rt2x00_dev *rt2x00dev); | 194 | void rt2x00leds_suspend(struct rt2x00_dev *rt2x00dev); |
| 195 | void rt2x00leds_resume(struct rt2x00_dev *rt2x00dev); | 195 | void rt2x00leds_resume(struct rt2x00_dev *rt2x00dev); |
| @@ -199,9 +199,8 @@ static inline void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev, | |||
| 199 | { | 199 | { |
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | static inline int rt2x00leds_register(struct rt2x00_dev *rt2x00dev) | 202 | static inline void rt2x00leds_register(struct rt2x00_dev *rt2x00dev) |
| 203 | { | 203 | { |
| 204 | return 0; | ||
| 205 | } | 204 | } |
| 206 | 205 | ||
| 207 | static inline void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev) | 206 | static inline void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev) |
