From 1cca0f702f1151362310f556253a8c7dfdf0c72a Mon Sep 17 00:00:00 2001
From: Ivo van Doorn <ivdoorn@gmail.com>
Date: Sun, 9 Mar 2008 22:47:08 +0100
Subject: [PATCH] --- yaml --- r: 90170 b: refs/heads/master c:
 72fa559bf44aab30ac5fc8317472ef3441f4aa64 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/wireless/rt2x00/rt2x00leds.c | 7 +++----
 trunk/drivers/net/wireless/rt2x00/rt2x00lib.h  | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 4dc712bf465c..4e9107f0e94d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 728103794316f7ff8d98bc2ce044aff7a260ee21
+refs/heads/master: 72fa559bf44aab30ac5fc8317472ef3441f4aa64
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00leds.c b/trunk/drivers/net/wireless/rt2x00/rt2x00leds.c
index 9c29d17e0cc2..ca2d282a9f75 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00leds.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt2x00leds.c
@@ -109,7 +109,7 @@ 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];
@@ -117,7 +117,7 @@ int rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
 	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));
@@ -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)
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00lib.h b/trunk/drivers/net/wireless/rt2x00/rt2x00lib.h
index 6bd5a01ddfce..a15227d2fe40 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/trunk/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -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);
@@ -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)