evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

brcm80211: fmac: remove function brcmf_bus_get_device

Browse source 
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: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Franky Lin 2011-11-22 17:21:58 -08:00 • committed by John W. Linville
parent fa20b91143
commit c0a7962ae7
3 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
View file

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

8
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
View file

@ -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;

5
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
View file

@ -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)
{ {