aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-06-30 09:16:14 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-07-10 12:16:53 -0400
commita5fed0c1e48ca6c153e33e63aef406b4ef97cd95 (patch)
tree855a42e1652c3059b6050ea533341dd15d753fa4
parent1ef1a57de7078edc2504d156be606249cc32c199 (diff)
brcmsmac: remove some unnessessacry casts and void pointer
Acked-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/brcm80211/brcmsmac/main.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 478b374b65e5..8bad8b6dad9d 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -4218,9 +4218,8 @@ static void brcms_c_radio_timer(void *arg)
4218} 4218}
4219 4219
4220/* common low-level watchdog code */ 4220/* common low-level watchdog code */
4221static void brcms_b_watchdog(void *arg) 4221static void brcms_b_watchdog(struct brcms_c_info *wlc)
4222{ 4222{
4223 struct brcms_c_info *wlc = (struct brcms_c_info *) arg;
4224 struct brcms_hardware *wlc_hw = wlc->hw; 4223 struct brcms_hardware *wlc_hw = wlc->hw;
4225 4224
4226 BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit); 4225 BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
@@ -4241,10 +4240,8 @@ static void brcms_b_watchdog(void *arg)
4241} 4240}
4242 4241
4243/* common watchdog code */ 4242/* common watchdog code */
4244static void brcms_c_watchdog(void *arg) 4243static void brcms_c_watchdog(struct brcms_c_info *wlc)
4245{ 4244{
4246 struct brcms_c_info *wlc = (struct brcms_c_info *) arg;
4247
4248 BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit); 4245 BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
4249 4246
4250 if (!wlc->pub->up) 4247 if (!wlc->pub->up)
@@ -4284,7 +4281,9 @@ static void brcms_c_watchdog(void *arg)
4284 4281
4285static void brcms_c_watchdog_by_timer(void *arg) 4282static void brcms_c_watchdog_by_timer(void *arg)
4286{ 4283{
4287 brcms_c_watchdog(arg); 4284 struct brcms_c_info *wlc = (struct brcms_c_info *) arg;
4285
4286 brcms_c_watchdog(wlc);
4288} 4287}
4289 4288
4290static bool brcms_c_timers_init(struct brcms_c_info *wlc, int unit) 4289static bool brcms_c_timers_init(struct brcms_c_info *wlc, int unit)