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

Commit d597ee7e authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmsmac: remove brcms_set_hint() function 



The function brcms_set_hint() does not add any functionality
so regulatory_hint() can be called directly. The error value
has been removed from the message when regulatory_hint() fails.

Reported-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 67711c17

drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c

+3 −11
Original line number Diff line number Diff line
@@ -721,14 +721,6 @@ static const struct ieee80211_ops brcms_ops = { 
	.flush = brcms_ops_flush,

};



/*

 * is called in brcms_bcma_probe() context, therefore no locking required.

 */

static int brcms_set_hint(struct brcms_info *wl, char *abbrev)

{

	return regulatory_hint(wl->pub->ieee_hw->wiphy, abbrev);

}



void brcms_dpc(unsigned long data)

{

	struct brcms_info *wl;
@@ -1068,9 +1060,9 @@ static struct brcms_info *brcms_attach(struct bcma_device *pdev) 
		wiphy_err(wl->wiphy, "%s: ieee80211_register_hw failed, status"

			  "%d\n", __func__, err);



	if (wl->pub->srom_ccode[0] && brcms_set_hint(wl, wl->pub->srom_ccode))

		wiphy_err(wl->wiphy, "%s: regulatory_hint failed, status %d\n",

			  __func__, err);

	if (wl->pub->srom_ccode[0] &&

	    regulatory_hint(wl->wiphy, wl->pub->srom_ccode))

		wiphy_err(wl->wiphy, "%s: regulatory hint failed\n", __func__);



	n_adapters_found++;

	return wl;