diff options
| author | Helge Deller <deller@gmx.de> | 2008-01-13 15:16:34 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:09:50 -0800 |
| commit | 60da481b98082ff5ffd233b18683c3ffe3ab618c (patch) | |
| tree | 3660cdeef28b88f3fc6997b299ac5a3158654b20 /drivers/net/wireless/wavelan_cs.c | |
| parent | eb189d8bc9824bcb2187ffdab27d77ab469264c3 (diff) | |
WAVELAN - compile-time check for struct sizes
Convert optional struct size checks to non-optional compile-time checks.
Furthermore BUILD_BUG_ON() which will be optimized away by the compiler.
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wavelan_cs.c')
| -rw-r--r-- | drivers/net/wireless/wavelan_cs.c | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index da1d4e8f0f6b..c2037b2a05bf 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c @@ -71,27 +71,6 @@ static void wv_nwid_filter(unsigned char mode, net_local *lp); * (wavelan modem or i82593) */ -#ifdef STRUCT_CHECK -/*------------------------------------------------------------------*/ -/* - * Sanity routine to verify the sizes of the various WaveLAN interface - * structures. - */ -static char * -wv_structuct_check(void) -{ -#define SC(t,s,n) if (sizeof(t) != s) return(n); - - SC(psa_t, PSA_SIZE, "psa_t"); - SC(mmw_t, MMW_SIZE, "mmw_t"); - SC(mmr_t, MMR_SIZE, "mmr_t"); - -#undef SC - - return((char *) NULL); -} /* wv_structuct_check */ -#endif /* STRUCT_CHECK */ - /******************* MODEM MANAGEMENT SUBROUTINES *******************/ /* * Useful subroutines to manage the modem of the wavelan @@ -3794,14 +3773,10 @@ wv_hw_config(struct net_device * dev) printk(KERN_DEBUG "%s: ->wv_hw_config()\n", dev->name); #endif -#ifdef STRUCT_CHECK - if(wv_structuct_check() != (char *) NULL) - { - printk(KERN_WARNING "%s: wv_hw_config: structure/compiler botch: \"%s\"\n", - dev->name, wv_structuct_check()); - return FALSE; - } -#endif /* STRUCT_CHECK == 1 */ + /* compile-time check the sizes of structures */ + BUILD_BUG_ON(sizeof(psa_t) != PSA_SIZE); + BUILD_BUG_ON(sizeof(mmw_t) != MMW_SIZE); + BUILD_BUG_ON(sizeof(mmr_t) != MMR_SIZE); /* Reset the pcmcia interface */ if(wv_pcmcia_reset(dev) == FALSE) |