staging: brcm80211: removed superfluous forward struct declarations
authorRoland Vossen <rvossen@broadcom.com>
Thu, 9 Jun 2011 14:44:55 +0000 (16:44 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 28 Jun 2011 20:02:42 +0000 (13:02 -0700)
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reported-by: Julian Calaby <julian.calaby@gmail.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/brcmfmac/wl_iw.c
drivers/staging/brcm80211/brcmsmac/channel.h
drivers/staging/brcm80211/brcmsmac/mac80211_if.h
drivers/staging/brcm80211/brcmsmac/nicpci.h
drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h
drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
drivers/staging/brcm80211/brcmsmac/phy_shim.h
drivers/staging/brcm80211/brcmsmac/pub.h
drivers/staging/brcm80211/brcmsmac/rate.h
drivers/staging/brcm80211/brcmsmac/types.h
drivers/staging/brcm80211/include/brcmu_utils.h

index a5f63f9da69cc9ff8da9eb817ac850871ba4b01b..71c8c68039d9e3f32f7f20998f58f66b1ee36d8e 100644 (file)
@@ -28,8 +28,6 @@
 #include "dngl_stats.h"
 #include "dhd.h"
 
-struct si_pub;
-
 #define WPA_OUI                        "\x00\x50\xF2"
 #define DOT11_MNG_RSN_ID                       48
 #define DOT11_MNG_WPA_ID                       221
index e7433927c9bcde2f0c8ae4d24969348bbab0e9f8..5ab1032d97265619a4dbfc1cb8b1f30fd079bdf3 100644 (file)
@@ -20,8 +20,6 @@
 #define WLC_TXPWR_DB_FACTOR 4  /* conversion for phy txpwr cacluations that use .25 dB units */
 
 
-struct brcms_c_info;
-
 /* maxpwr mapping to 5GHz band channels:
  * maxpwr[0] - channels [34-48]
  * maxpwr[1] - channels [52-60]
index 71526b21161d535c32e55e6819aee5898ff15d73..26a0a3031e83381d1eeaf4178e60837032d72775 100644 (file)
@@ -83,9 +83,6 @@ struct brcms_info {
 };
 
 /* misc callbacks */
-struct brcms_info;
-struct brcms_if;
-struct brcms_c_if;
 extern void brcms_init(struct brcms_info *wl);
 extern uint brcms_reset(struct brcms_info *wl);
 extern void brcms_intrson(struct brcms_info *wl);
@@ -99,7 +96,6 @@ extern bool wl_alloc_dma_resources(struct brcms_info *wl, uint dmaddrwidth);
 extern bool brcms_rfkill_set_hw_state(struct brcms_info *wl);
 
 /* timer functions */
-struct brcms_timer;
 extern struct brcms_timer *brcms_init_timer(struct brcms_info *wl,
                                      void (*fn) (void *arg), void *arg,
                                      const char *name);
index 826c162cff6dce133ad59bb46957bd5c8e9a6e19..f71f842a2156a28d4b5283fea611bdf636e81e57 100644 (file)
@@ -70,8 +70,6 @@
 #define SRSH_PI_MASK   0xf000  /* bit 15:12 */
 #define SRSH_PI_SHIFT  12      /* bit 15:12 */
 
-struct si_pub;
-
 extern void *pcicore_init(struct si_pub *sih, void *pdev, void *regs);
 extern void pcicore_deinit(void *pch);
 extern void pcicore_attach(void *pch, char *pvars, int state);
index db994408f6e3a5012fe6ece1a87f7570b7a7ee47..756ad715596a007722afb04309278d19d8950af5 100644 (file)
@@ -154,10 +154,6 @@ struct chanvec {
        u8 vec[MAXCHANNEL / NBBY];
 };
 
-struct rpc_info;
-
-struct phy_pub;
-
 struct shared_phy_params {
        struct si_pub *sih;
        void *physhim;
index fa0ff3ffc5a8ad8c724087b7eb3aeddc42e30c6f..9506da5d2dac5c139544f8ced1bc4f32ef5d24fe 100644 (file)
@@ -49,7 +49,6 @@ struct wlc_phy_srom_fem {
        u8 antswctrllut;        /* antswctrl lookup table configuration: 32 possible choices */
 };
 
-struct brcms_c_hw_info;
 typedef void (*initfn_t) (phy_info_t *);
 typedef void (*chansetfn_t) (phy_info_t *, chanspec_t);
 typedef int (*longtrnfn_t) (phy_info_t *, int);
@@ -579,9 +578,6 @@ struct phy_pub {
        bool abgphy_encore;
 };
 
-struct phy_info_nphy;
-struct phy_info_lcnphy;
-
 struct phy_func_ptr {
        initfn_t init;
        initfn_t calinit;
index 4b45b2cd4d858009f9f16add56c5f0f604b0e1f3..413d5dbba0d9852d7d53c6ac8abe3a3e3b37ca48 100644 (file)
 #define WLC_N_TXRX_CHAIN0              0
 #define WLC_N_TXRX_CHAIN1              1
 
-/* Forward declarations */
-struct brcms_c_hw_info;
-
 extern wlc_phy_shim_info_t *wlc_phy_shim_attach(struct brcms_c_hw_info *wlc_hw,
                                                void *wl, void *wlc);
 extern void wlc_phy_shim_detach(wlc_phy_shim_info_t *physhim);
 
 /* PHY to WL utility functions */
-struct wlapi_timer;
 extern struct wlapi_timer *wlapi_init_timer(wlc_phy_shim_info_t *physhim,
                                            void (*fn) (void *arg), void *arg,
                                            const char *name);
index 25c65e83a68423e3be14e7339399d6d69a3895cb..2ec3ba962e667aa0fcbccca2857a7ecca6a96fd0 100644 (file)
 #define        WL_SPURAVOID_ON1        1
 #define        WL_SPURAVOID_ON2        2
 
-struct ieee80211_tx_queue_params;
-
 struct wlc_tunables {
        int ntxd;               /* size of tx descriptor table */
        int nrxd;               /* size of rx descriptor table */
@@ -187,9 +185,6 @@ struct wlc_bss_info {
        u8 wpacfg;              /* wpa config index */
 };
 
-/* forward declarations */
-struct brcms_c_if;
-
 /* brcms_c_ioctl error codes */
 #define WLC_ENOIOCTL   1       /* No such Ioctl */
 #define WLC_EINVAL     2       /* Invalid value */
@@ -384,14 +379,6 @@ enum wlc_par_id {
        IOV_BCN_LI_BCN          /* Beacon listen interval in # of beacons */
 };
 
-/* forward declare and use the struct notation so we don't have to
- * have it defined if not necessary.
- */
-struct brcms_c_info;
-struct brcms_c_hw_info;
-struct brcms_c_bsscfg;
-struct brcms_c_if;
-
 /***********************************************
  * Feature-related macros to optimize out code *
  * *********************************************
@@ -637,7 +624,6 @@ extern void wlc_rate_lookup_init(struct brcms_c_info *wlc,
                                 wlc_rateset_t *rateset);
 extern void brcms_default_rateset(struct brcms_c_info *wlc, wlc_rateset_t *rs);
 
-struct ieee80211_sta;
 extern void wlc_ampdu_flush(struct brcms_c_info *wlc,
                            struct ieee80211_sta *sta, u16 tid);
 extern int brcms_c_set_par(struct brcms_c_info *wlc, enum wlc_par_id par_id,
index 36cb91b1b8fc08396a7298057ccd3c8b37959475..28ba4d6b0c5d71a3d600179042f7de12c9eb7fda 100644 (file)
@@ -138,8 +138,6 @@ extern const u8 ofdm_rate_lookup[];
 #define WLC_RATES_CCK          1
 #define WLC_RATES_OFDM         2
 
-struct wlc_rateset;
-
 /* sanitize, and sort a rateset with the basic bit(s) preserved, validate rateset */
 extern bool wlc_rate_hwrs_filter_sort_validate(struct wlc_rateset *rs,
                                               const struct wlc_rateset *hw_rs,
index 3f53e8c46cef44c5e3be62553bb8ca3e7ca18241..163973dfb19b2e410847bb0c324c0e4b664a60e4 100644 (file)
@@ -371,6 +371,8 @@ struct wiphy;
 struct brcmu_iovar;
 struct brcms_c_txq_info;
 struct brcms_c_band;
+struct ieee80211_tx_queue_params;
+struct ieee80211_sta;
 
 typedef struct gpioh_item gpioh_item_t;
 typedef struct si_info si_info_t;
index 863b3c7d195195c0a4cb56bb7f44e6e2f83b898b..78c84e231adfcda62432763360cad25bff2d5ddf 100644 (file)
@@ -139,7 +139,7 @@ extern uint brcmu_pkttotlen(struct sk_buff *p);
 extern int brcmu_ether_atoe(char *p, u8 *ea);
 
 /* ip address */
-       struct ipv4_addr;
+struct ipv4_addr;
 
 #ifdef BCMDBG
 extern void brcmu_prpkt(const char *msg, struct sk_buff *p0);