diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2012-03-02 14:22:46 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-05 15:53:47 -0500 |
commit | 8f526ab4aa1b145bda2baf56e223050c7ef3e1b0 (patch) | |
tree | 9b511162b86f6a44a12757c5374ddda6f14f6d13 /drivers/net/wireless/rtlwifi/usb.c | |
parent | 48de1a17fc41613b7e9d61037fa989256d04234f (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/usb.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/usb.c | 5 |
1 files changed, 2 insertions, 3 deletions
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) | |||
362 | return err; | 362 | return err; |
363 | } | 363 | } |
364 | 364 | ||
365 | static int _rtl_usb_init_sw(struct ieee80211_hw *hw) | 365 | static void rtl_usb_init_sw(struct ieee80211_hw *hw) |
366 | { | 366 | { |
367 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); | 367 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); |
368 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); | 368 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); |
@@ -397,7 +397,6 @@ static int _rtl_usb_init_sw(struct ieee80211_hw *hw) | |||
397 | /* HIMR_EX - turn all on */ | 397 | /* HIMR_EX - turn all on */ |
398 | rtlusb->irq_mask[1] = 0xFFFFFFFF; | 398 | rtlusb->irq_mask[1] = 0xFFFFFFFF; |
399 | rtlusb->disableHWSM = true; | 399 | rtlusb->disableHWSM = true; |
400 | return 0; | ||
401 | } | 400 | } |
402 | 401 | ||
403 | #define __RADIO_TAP_SIZE_RSV 32 | 402 | #define __RADIO_TAP_SIZE_RSV 32 |
@@ -983,7 +982,7 @@ int __devinit rtl_usb_probe(struct usb_interface *intf, | |||
983 | err = _rtl_usb_init(hw); | 982 | err = _rtl_usb_init(hw); |
984 | if (err) | 983 | if (err) |
985 | goto error_out; | 984 | goto error_out; |
986 | err = _rtl_usb_init_sw(hw); | 985 | rtl_usb_init_sw(hw); |
987 | /* Init mac80211 sw */ | 986 | /* Init mac80211 sw */ |
988 | err = rtl_init_core(hw); | 987 | err = rtl_init_core(hw); |
989 | if (err) { | 988 | if (err) { |