From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Fri, 2 Mar 2012 19:22:46 +0000 (-0600)
Subject: rtlwifi: Remove extraneous value return
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8f526ab4aa1b145bda2baf56e223050c7ef3e1b0;p=linux-beck.git

rtlwifi: Remove extraneous value return

In usb.c, routine _rtl_usb_init_sw() always returns 0, and rtl_usb_probe()
never checks the returned value. Thus we can change _rtl_usb_init_sw() to
a void routine. In addition, remove the underscore at the beginning of the
name of the routine.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index b0eee0eb5679..2e1e352864bb 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -362,7 +362,7 @@ static int _rtl_usb_init(struct ieee80211_hw *hw)
 	return err;
 }
 
-static int _rtl_usb_init_sw(struct ieee80211_hw *hw)
+static void rtl_usb_init_sw(struct ieee80211_hw *hw)
 {
 	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
 	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
@@ -397,7 +397,6 @@ static int _rtl_usb_init_sw(struct ieee80211_hw *hw)
 	/* HIMR_EX - turn all on */
 	rtlusb->irq_mask[1] = 0xFFFFFFFF;
 	rtlusb->disableHWSM =  true;
-	return 0;
 }
 
 #define __RADIO_TAP_SIZE_RSV	32
@@ -983,7 +982,7 @@ int __devinit rtl_usb_probe(struct usb_interface *intf,
 	err = _rtl_usb_init(hw);
 	if (err)
 		goto error_out;
-	err = _rtl_usb_init_sw(hw);
+	rtl_usb_init_sw(hw);
 	/* Init mac80211 sw */
 	err = rtl_init_core(hw);
 	if (err) {