mirror of https://gitee.com/openkylin/linux.git
staging: brcm80211: fix "ERROR: spaces required around that ..."
Signed-off-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
2ae3b7ea9f
commit
fd64bcc48b
|
@ -415,15 +415,15 @@ extern "C" {
|
|||
}
|
||||
|
||||
#ifndef ABS
|
||||
#define ABS(a) (((a) < 0)? -(a):(a))
|
||||
#define ABS(a) (((a) < 0) ? -(a):(a))
|
||||
#endif /* ABS */
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(a, b) (((a) < (b))?(a):(b))
|
||||
#define MIN(a, b) (((a) < (b)) ? (a):(b))
|
||||
#endif /* MIN */
|
||||
|
||||
#ifndef MAX
|
||||
#define MAX(a, b) (((a) > (b))?(a):(b))
|
||||
#define MAX(a, b) (((a) > (b)) ? (a):(b))
|
||||
#endif /* MAX */
|
||||
|
||||
#define CEIL(x, y) (((x) + ((y)-1)) / (y))
|
||||
|
|
|
@ -38,7 +38,7 @@ static INLINE uint32 find_msbit(uint32 x);
|
|||
static INLINE uint32 find_msbit(uint32 x)
|
||||
{
|
||||
uint msbit;
|
||||
__asm__("bsrl %1,%0":"=r"(msbit)
|
||||
__asm__("bsrl %1,%0" : "=r"(msbit)
|
||||
: "r"(x));
|
||||
return msbit;
|
||||
}
|
||||
|
|
|
@ -971,7 +971,7 @@ uint16
|
|||
|
||||
#define LCNPHY_IQLOCC_READ(val) ((uint8)(-(int8)(((val) & 0xf0) >> 4) + (int8)((val) & 0x0f)))
|
||||
#define FIXED_TXPWR 78
|
||||
#define LCNPHY_TEMPSENSE(val) ((int16)((val > 255)?(val - 512):val))
|
||||
#define LCNPHY_TEMPSENSE(val) ((int16)((val > 255) ? (val - 512) : val))
|
||||
|
||||
static uint32 wlc_lcnphy_qdiv_roundup(uint32 divident, uint32 divisor,
|
||||
uint8 precision);
|
||||
|
|
|
@ -1612,13 +1612,13 @@ static void __devexit wl_remove(struct pci_dev *pdev)
|
|||
|
||||
static struct pci_driver wl_pci_driver = {
|
||||
name: "brcm80211",
|
||||
probe:wl_pci_probe,
|
||||
probe: wl_pci_probe,
|
||||
#ifdef LINUXSTA_PS
|
||||
suspend:wl_suspend,
|
||||
resume:wl_resume,
|
||||
suspend: wl_suspend,
|
||||
resume: wl_resume,
|
||||
#endif /* LINUXSTA_PS */
|
||||
remove:__devexit_p(wl_remove),
|
||||
id_table:wl_id_table,
|
||||
remove: __devexit_p(wl_remove),
|
||||
id_table: wl_id_table,
|
||||
};
|
||||
#endif /* !BCMSDIO */
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ struct wlc_info;
|
|||
|
||||
/* macro to get 5 GHz channel group index for tx power */
|
||||
#define CHANNEL_POWER_IDX_5G(c) \
|
||||
(((c) < 52) ? 0 : (((c) < 62) ? 1 :(((c) < 100) ? 2 : (((c) < 149) ? 3 : 4))))
|
||||
(((c) < 52) ? 0 : (((c) < 62) ? 1 : (((c) < 100) ? 2 : (((c) < 149) ? 3 : 4))))
|
||||
|
||||
#define WLC_MAXPWR_TBL_SIZE 6 /* max of BAND_5G_PWR_LVLS and 6 for 2.4 GHz */
|
||||
#define WLC_MAXPWR_MIMO_TBL_SIZE 14 /* max of BAND_5G_PWR_LVLS and 14 for 2.4 GHz */
|
||||
|
|
|
@ -834,7 +834,7 @@ struct antsel_info {
|
|||
};
|
||||
|
||||
#define CHANNEL_BANDUNIT(wlc, ch) (((ch) <= CH_MAX_2G_CHANNEL) ? BAND_2G_INDEX : BAND_5G_INDEX)
|
||||
#define OTHERBANDUNIT(wlc) ((uint)((wlc)->band->bandunit? BAND_2G_INDEX : BAND_5G_INDEX))
|
||||
#define OTHERBANDUNIT(wlc) ((uint)((wlc)->band->bandunit ? BAND_2G_INDEX : BAND_5G_INDEX))
|
||||
|
||||
#define IS_MBAND_UNLOCKED(wlc) \
|
||||
((NBANDS(wlc) > 1) && !(wlc)->bandlocked)
|
||||
|
|
|
@ -452,7 +452,7 @@ typedef struct {
|
|||
#define WLPKTFLAG_RIFS(pkttag) ((pkttag)->flags & WLF_RIFS)
|
||||
|
||||
/* API for accessing BSSCFG index in WLPKTTAG */
|
||||
#define BSSCFGIDX_ISVALID(bsscfgidx) (((bsscfgidx >= 0)&&(bsscfgidx < WLC_MAXBSSCFG)) ? 1 : 0)
|
||||
#define BSSCFGIDX_ISVALID(bsscfgidx) (((bsscfgidx >= 0) && (bsscfgidx < WLC_MAXBSSCFG)) ? 1 : 0)
|
||||
|
||||
static INLINE int8 wlc_pkttag_bsscfg_get(void *p)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue