brcm80211: fmac: remove function brcmf_bus_get_device
authorFranky Lin <frankyl@broadcom.com>
Wed, 23 Nov 2011 01:21:58 +0000 (17:21 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Nov 2011 19:43:48 +0000 (14:43 -0500)
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>
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

index cfcf5a9c1d23a94ba4df5f149cb7870a985938e2..1b5786010f9fcf8e184a48e274f4aedd781b9d10 100644 (file)
@@ -27,9 +27,6 @@
  * 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 */
 extern void brcmf_sdbrcm_bus_stop(struct brcmf_sdio *bus);
 
index f8c0ae4eb2e03cd6842877ef888e6bed80419a69..20d82215a8492ddb31edb52d837a420d5da97c0c 100644 (file)
@@ -608,8 +608,7 @@ static void brcmf_ethtool_get_drvinfo(struct net_device *ndev,
 
        sprintf(info->driver, KBUILD_MODNAME);
        sprintf(info->version, "%lu", drvr_priv->pub.drv_version);
-       sprintf(info->bus_info, "%s",
-               dev_name(brcmf_bus_get_device(drvr_priv->pub.bus)));
+       sprintf(info->bus_info, "%s", dev_name(drvr_priv->pub.dev));
 }
 
 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 */
        if (!ifidx) {
-               drvr->config =
-                       brcmf_cfg80211_attach(ndev,
-                                             brcmf_bus_get_device(drvr->bus),
-                                             drvr);
+               drvr->config = brcmf_cfg80211_attach(ndev, drvr->dev, drvr);
                if (drvr->config == NULL) {
                        brcmf_dbg(ERROR, "wl_cfg80211_attach failed\n");
                        goto fail;
index 8c00014a760c8aeaa62a319d11aebbfa584c0b8a..5d81052832b4139aff6ea3fd0fe289fba7971837 100644 (file)
@@ -3999,11 +3999,6 @@ void brcmf_sdbrcm_disconnect(void *ptr)
        brcmf_dbg(TRACE, "Disconnected\n");
 }
 
-struct device *brcmf_bus_get_device(struct brcmf_sdio *bus)
-{
-       return &bus->sdiodev->func[2]->dev;
-}
-
 void
 brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick)
 {