brcmfmac: get rid of void pointer in struct brcmf_cfg80211_priv
authorArend van Spriel <arend@broadcom.com>
Wed, 19 Sep 2012 20:21:18 +0000 (22:21 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Sep 2012 19:02:07 +0000 (15:02 -0400)
Field 'pub' in struct brcmf_cfg80211_priv was types as void pointer
and filled with parameter passed in brcmf_cfg80211_attach(). This
patch makes the type specific, ie. struct brcmf_pub.

Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h

index 078e293c05edb438049e97bceaf7da38ea28e59d..e40cfe846a48903c976bebda15b8aea990f4ffd7 100644 (file)
@@ -4266,7 +4266,7 @@ static void wl_deinit_priv(struct brcmf_cfg80211_priv *cfg_priv)
 
 struct brcmf_cfg80211_dev *brcmf_cfg80211_attach(struct net_device *ndev,
                                                 struct device *busdev,
-                                                void *data)
+                                                struct brcmf_pub *drvr)
 {
        struct wireless_dev *wdev;
        struct brcmf_cfg80211_priv *cfg_priv;
@@ -4291,7 +4291,7 @@ struct brcmf_cfg80211_dev *brcmf_cfg80211_attach(struct net_device *ndev,
        wdev->iftype = brcmf_mode_to_nl80211_iftype(WL_MODE_BSS);
        cfg_priv = wdev_to_cfg(wdev);
        cfg_priv->wdev = wdev;
-       cfg_priv->pub = data;
+       cfg_priv->pub = drvr;
        ci = (struct brcmf_cfg80211_iface *)&cfg_priv->ci;
        ci->cfg_priv = cfg_priv;
        ndev->ieee80211_ptr = wdev;
index a2138c185c6596779d9d568467983df822aa5748..52e408ed6f41e35418a14c14ec1f77a2fd288363 100644 (file)
@@ -438,7 +438,7 @@ struct brcmf_cfg80211_priv {
        struct brcmf_cfg80211_pmk_list *pmk_list;
        struct work_struct event_work;
        unsigned long status;
-       void *pub;
+       struct brcmf_pub *pub;
        u32 channel;
        bool iscan_on;
        bool iscan_kickstart;
@@ -497,7 +497,7 @@ brcmf_cfg80211_connect_info *cfg_to_conn(struct brcmf_cfg80211_priv *cfg)
 
 extern struct brcmf_cfg80211_dev *brcmf_cfg80211_attach(struct net_device *ndev,
                                                        struct device *busdev,
-                                                       void *data);
+                                                       struct brcmf_pub *drvr);
 extern void brcmf_cfg80211_detach(struct brcmf_cfg80211_dev *cfg);
 
 /* event handler from dongle */