Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d769f4ce authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

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: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 26bcc181

drivers/staging/brcm80211/brcmsmac/wlc_antsel.c

+6 −7
Original line number Diff line number Diff line
@@ -94,20 +94,19 @@ const u8 mimo_2x3_div_antselid_tbl[16] = { 
	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) {

		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;

	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");
@@ -150,7 +149,7 @@ struct antsel_info *wlc_antsel_attach(struct wlc_info *wlc, 
	}



	/* 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);

drivers/staging/brcm80211/brcmsmac/wlc_antsel.h

+4 −5
Original line number Diff line number Diff line
@@ -16,10 +16,8 @@ 


#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,
@@ -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);



#endif /* _wlc_antsel_h_ */

drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -1692,7 +1692,7 @@ static uint wlc_attach_module(struct wlc_info *wlc) 
	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;