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

Commit c0a7962a authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcm80211: fmac: remove function brcmf_bus_get_device 



brcmf_bus_get_device is no longer necessary. Use dongle device pointer
saved in brcmf_pub directly. This is part of the fullmac bus interface
refactoring.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fa20b911

drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -27,9 +27,6 @@ 
 * Exported from brcmf bus module (brcmf_usb, brcmf_sdio)

 * Exported from brcmf bus module (brcmf_usb, brcmf_sdio)

 */

 */





/* obtain linux device object providing bus function */

extern struct device *brcmf_bus_get_device(struct brcmf_sdio *bus);



/* Stop bus module: clear pending frames, disable data flow */

/* Stop bus module: clear pending frames, disable data flow */

extern void brcmf_sdbrcm_bus_stop(struct brcmf_sdio *bus);

extern void brcmf_sdbrcm_bus_stop(struct brcmf_sdio *bus);

drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -608,8 +608,7 @@ static void brcmf_ethtool_get_drvinfo(struct net_device *ndev, 




	sprintf(info->driver, KBUILD_MODNAME);

	sprintf(info->driver, KBUILD_MODNAME);

	sprintf(info->version, "%lu", drvr_priv->pub.drv_version);

	sprintf(info->version, "%lu", drvr_priv->pub.drv_version);

	sprintf(info->bus_info, "%s",

	sprintf(info->bus_info, "%s", dev_name(drvr_priv->pub.dev));

		dev_name(brcmf_bus_get_device(drvr_priv->pub.bus)));

}

}





static struct ethtool_ops brcmf_ethtool_ops = {

static struct ethtool_ops brcmf_ethtool_ops = {
@@ -1082,10 +1081,7 @@ int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx) 




	/* attach to cfg80211 for primary interface */

	/* attach to cfg80211 for primary interface */

	if (!ifidx) {

	if (!ifidx) {

		drvr->config =

		drvr->config = brcmf_cfg80211_attach(ndev, drvr->dev, drvr);

			brcmf_cfg80211_attach(ndev,

					      brcmf_bus_get_device(drvr->bus),

					      drvr);

		if (drvr->config == NULL) {

		if (drvr->config == NULL) {

			brcmf_dbg(ERROR, "wl_cfg80211_attach failed\n");

			brcmf_dbg(ERROR, "wl_cfg80211_attach failed\n");

			goto fail;

			goto fail;

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -3999,11 +3999,6 @@ void brcmf_sdbrcm_disconnect(void *ptr) 
	brcmf_dbg(TRACE, "Disconnected\n");

	brcmf_dbg(TRACE, "Disconnected\n");

}

}





struct device *brcmf_bus_get_device(struct brcmf_sdio *bus)

{

	return &bus->sdiodev->func[2]->dev;

}



void

void

brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick)

brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick)

{

{