staging: brcm80211: change prototype for wlc_antsel_attach

wlc_antsel_attach was called with four parameters but actually
three parameters were already provided in the first parameter.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
index 0a52989313edec538517f5d6c9236f1950f832bf..5b195ed63768a2c392ceac1a51c0d9639eaf2410 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
@@ -94,20 +94,19 @@ const u8 mimo_2x3_div_antselid_tbl[16] = {
        0, 0, 0, 0, 0, 0, 0, 0  /* pat to antselid */
 };
 
        0, 0, 0, 0, 0, 0, 0, 0  /* pat to antselid */
 };
 

-struct antsel_info *wlc_antsel_attach(struct wlc_info *wlc,
-                                     struct osl_info *osh,
-                                     struct wlc_pub *pub,
-                                     struct wlc_hw_info *wlc_hw) {
+struct antsel_info *wlc_antsel_attach(struct wlc_info *wlc)
+{

        struct antsel_info *asi;
 
        asi = kzalloc(sizeof(struct antsel_info), GFP_ATOMIC);
        if (!asi) {
        struct antsel_info *asi;
 
        asi = kzalloc(sizeof(struct antsel_info), GFP_ATOMIC);
        if (!asi) {

-               WL_ERROR("wl%d: wlc_antsel_attach: out of mem\n", pub->unit);
+               WL_ERROR("wl%d: wlc_antsel_attach: out of mem\n",
+                        wlc->pub->unit);

                return NULL;
        }
 
        asi->wlc = wlc;
                return NULL;
        }
 
        asi->wlc = wlc;

-       asi->pub = pub;
+       asi->pub = wlc->pub;

        asi->antsel_type = ANTSEL_NA;
        asi->antsel_avail = false;
        asi->antsel_antswitch = (u8) getintvar(asi->pub->vars, "antswitch");
        asi->antsel_type = ANTSEL_NA;
        asi->antsel_avail = false;
        asi->antsel_antswitch = (u8) getintvar(asi->pub->vars, "antswitch");


@@ -150,7 +149,7 @@ struct antsel_info *wlc_antsel_attach(struct wlc_info *wlc,
        }
 
        /* Set the antenna selection type for the low driver */
        }
 
        /* Set the antenna selection type for the low driver */

-       wlc_bmac_antsel_type_set(wlc_hw, asi->antsel_type);
+       wlc_bmac_antsel_type_set(wlc->hw, asi->antsel_type);

 
        /* Init (auto/manual) antenna selection */
        wlc_antsel_init_cfg(asi, &asi->antcfg_11n, true);
 
        /* Init (auto/manual) antenna selection */
        wlc_antsel_init_cfg(asi, &asi->antcfg_11n, true);

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.h b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.h
index 8875b584866533511173c7beb01517f5089c46f5..2470c73fc4eddbe6f33600df094c4f53bc9f4176 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.h
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.h
@@ -16,10 +16,8 @@
 
 #ifndef _wlc_antsel_h_
 #define _wlc_antsel_h_
 
 #ifndef _wlc_antsel_h_
 #define _wlc_antsel_h_

-extern struct antsel_info *wlc_antsel_attach(struct wlc_info *wlc,
-                                       struct osl_info *osh,
-                                       struct wlc_pub *pub,
-                                       struct wlc_hw_info *wlc_hw);
+
+extern struct antsel_info *wlc_antsel_attach(struct wlc_info *wlc);

 extern void wlc_antsel_detach(struct antsel_info *asi);
 extern void wlc_antsel_init(struct antsel_info *asi);
 extern void wlc_antsel_antcfg_get(struct antsel_info *asi, bool usedef,
 extern void wlc_antsel_detach(struct antsel_info *asi);
 extern void wlc_antsel_init(struct antsel_info *asi);
 extern void wlc_antsel_antcfg_get(struct antsel_info *asi, bool usedef,


@@ -27,4 +25,5 @@ extern void wlc_antsel_antcfg_get(struct antsel_info *asi, bool usedef,
                                  u8 id, u8 fbid, u8 *antcfg,
                                  u8 *fbantcfg);
 extern u8 wlc_antsel_antsel2id(struct antsel_info *asi, u16 antsel);
                                  u8 id, u8 fbid, u8 *antcfg,
                                  u8 *fbantcfg);
 extern u8 wlc_antsel_antsel2id(struct antsel_info *asi, u16 antsel);

-#endif                         /* _wlc_antsel_h_ */
+
+#endif /* _wlc_antsel_h_ */

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
index c00051bcf9a7d27dae5f06cb3901a48e3b51e90d..aefef8e29c5cb5d8e7950ae5625b532bdfd5f8ce 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
@@ -1692,7 +1692,7 @@ static uint wlc_attach_module(struct wlc_info *wlc)
        uint unit;
        unit = wlc->pub->unit;
 
        uint unit;
        unit = wlc->pub->unit;
 

-       wlc->asi = wlc_antsel_attach(wlc, wlc->osh, wlc->pub, wlc->hw);
+       wlc->asi = wlc_antsel_attach(wlc);

        if (wlc->asi == NULL) {
                WL_ERROR("wl%d: wlc_attach: wlc_antsel_attach failed\n", unit);
                err = 44;
        if (wlc->asi == NULL) {
                WL_ERROR("wl%d: wlc_attach: wlc_antsel_attach failed\n", unit);
                err = 44;