aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00leds.c7
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00lib.h5
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
112int rt2x00leds_register(struct rt2x00_dev *rt2x00dev) 112void 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
166exit_fail: 166exit_fail:
167 rt2x00leds_unregister(rt2x00dev); 167 rt2x00leds_unregister(rt2x00dev);
168 return retval;
169} 168}
170 169
171static void rt2x00leds_unregister_trigger(struct rt2x00_trigger *trigger) 170static 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
191void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev, int rssi); 191void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev, int rssi);
192int rt2x00leds_register(struct rt2x00_dev *rt2x00dev); 192void rt2x00leds_register(struct rt2x00_dev *rt2x00dev);
193void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev); 193void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev);
194void rt2x00leds_suspend(struct rt2x00_dev *rt2x00dev); 194void rt2x00leds_suspend(struct rt2x00_dev *rt2x00dev);
195void rt2x00leds_resume(struct rt2x00_dev *rt2x00dev); 195void 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
202static inline int rt2x00leds_register(struct rt2x00_dev *rt2x00dev) 202static inline void rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
203{ 203{
204 return 0;
205} 204}
206 205
207static inline void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev) 206static inline void rt2x00leds_unregister(struct rt2x00_dev *rt2x00dev)