staging: brcm80211: replaced typedef wlc_pub_t by struct wlc_pub

Code cleanup

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.h b/drivers/staging/brcm80211/sys/wl_mac80211.h
index 87a8128..bb39b77 100644 (file)
--- a/drivers/staging/brcm80211/sys/wl_mac80211.h
+++ b/drivers/staging/brcm80211/sys/wl_mac80211.h
@@ -60,7 +60,7 @@ struct wl_firmware {
 };
 
 struct wl_info {
-       wlc_pub_t *pub;         /* pointer to public wlc state */
+       struct wlc_pub *pub;            /* pointer to public wlc state */
        void *wlc;              /* pointer to private common os-independent data */
        struct osl_info *osh;           /* pointer to os handler */
        u32 magic;

diff --git a/drivers/staging/brcm80211/sys/wlc_alloc.c b/drivers/staging/brcm80211/sys/wlc_alloc.c
index 7d04d53..9af2d17 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_alloc.c
+++ b/drivers/staging/brcm80211/sys/wlc_alloc.c
@@ -32,9 +32,9 @@
 #include <wlc_alloc.h>
 #include <wl_dbg.h>
 
-static wlc_pub_t *wlc_pub_malloc(struct osl_info *osh, uint unit, uint *err,
-                                uint devid);
-static void wlc_pub_mfree(struct osl_info *osh, wlc_pub_t *pub);
+static struct wlc_pub *wlc_pub_malloc(struct osl_info *osh, uint unit,
+                                     uint *err, uint devid);
+static void wlc_pub_mfree(struct osl_info *osh, struct wlc_pub *pub);
 static void wlc_tunables_init(wlc_tunables_t *tunables, uint devid);
 
 void *wlc_calloc(struct osl_info *osh, uint unit, uint size)
@@ -65,12 +65,12 @@ void wlc_tunables_init(wlc_tunables_t *tunables, uint devid)
        tunables->txsbnd = TXSBND;
 }
 
-static wlc_pub_t *wlc_pub_malloc(struct osl_info *osh, uint unit, uint *err,
-                                uint devid)
+static struct wlc_pub *wlc_pub_malloc(struct osl_info *osh, uint unit,
+                                     uint *err, uint devid)
 {
-       wlc_pub_t *pub;
+       struct wlc_pub *pub;
 
-       pub = (wlc_pub_t *) wlc_calloc(osh, unit, sizeof(wlc_pub_t));
+       pub = (struct wlc_pub *) wlc_calloc(osh, unit, sizeof(struct wlc_pub));
        if (pub == NULL) {
                *err = 1001;
                goto fail;
@@ -100,7 +100,7 @@ static wlc_pub_t *wlc_pub_malloc(struct osl_info *osh, uint unit, uint *err,
        return NULL;
 }
 
-static void wlc_pub_mfree(struct osl_info *osh, wlc_pub_t *pub)
+static void wlc_pub_mfree(struct osl_info *osh, struct wlc_pub *pub)
 {
        if (pub == NULL)
                return;
@@ -179,7 +179,7 @@ struct wlc_info *wlc_attach_malloc(struct osl_info *osh, uint unit, uint *err,
 
        wlc->hwrxoff = WL_HWRXOFF;
 
-       /* allocate wlc_pub_t state structure */
+       /* allocate struct wlc_pub state structure */
        wlc->pub = wlc_pub_malloc(osh, unit, err, devid);
        if (wlc->pub == NULL) {
                *err = 1003;

diff --cc drivers/staging/brcm80211/sys/wlc_antsel.c
Simple merge

diff --cc drivers/staging/brcm80211/sys/wlc_antsel.h
Simple merge

diff --cc drivers/staging/brcm80211/sys/wlc_channel.c
Simple merge

diff --cc drivers/staging/brcm80211/sys/wlc_event.c
Simple merge

diff --cc drivers/staging/brcm80211/sys/wlc_event.h
Simple merge

diff --cc drivers/staging/brcm80211/sys/wlc_mac80211.c
Simple merge

diff --cc drivers/staging/brcm80211/sys/wlc_mac80211.h
Simple merge

diff --cc drivers/staging/brcm80211/sys/wlc_pub.h
Simple merge