diff options
| author | Greg Kroah-Hartman | 2010-10-08 20:55:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-10-08 20:55:40 +0200 |
| commit | 36c63ff6afb1bdc2d93aac6d207d6529177d47f8 (patch) | |
| tree | 7831c526e0914325e479302964dd00dc518d1862 /drivers/staging/brcm80211/sys | |
| parent | Staging: brcm80211: remove unused ALIGN_ADDR() macro (diff) | |
| download | kernel-qcow2-linux-36c63ff6afb1bdc2d93aac6d207d6529177d47f8.tar.gz kernel-qcow2-linux-36c63ff6afb1bdc2d93aac6d207d6529177d47f8.tar.xz kernel-qcow2-linux-36c63ff6afb1bdc2d93aac6d207d6529177d47f8.zip | |
Staging: brcm80211: remove ISALIGNED macro
And use the kernel provided IS_ALIGNED one instead.
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys')
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_bmac.c | 6 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c index 871ee99ee4a6..32cdd08312b3 100644 --- a/drivers/staging/brcm80211/sys/wlc_bmac.c +++ b/drivers/staging/brcm80211/sys/wlc_bmac.c @@ -1789,8 +1789,8 @@ wlc_bmac_write_template_ram(wlc_hw_info_t *wlc_hw, int offset, int len, regs = wlc_hw->regs; osh = wlc_hw->osh; - ASSERT(ISALIGNED(offset, sizeof(u32))); - ASSERT(ISALIGNED(len, sizeof(u32))); + ASSERT(IS_ALIGNED(offset, sizeof(u32))); + ASSERT(IS_ALIGNED(len, sizeof(u32))); ASSERT((offset & ~0xffff) == 0); W_REG(osh, ®s->tplatewrptr, offset); @@ -2824,7 +2824,7 @@ BCMATTACHFN(wlc_ucode_write) (wlc_hw_info_t *wlc_hw, const u32 ucode[], WL_TRACE(("wl%d: wlc_ucode_write\n", wlc_hw->unit)); - ASSERT(ISALIGNED(nbytes, sizeof(u32))); + ASSERT(IS_ALIGNED(nbytes, sizeof(u32))); count = (nbytes / sizeof(u32)); diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c index 86eeeba2d969..6ffbb02ad17d 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c @@ -1793,7 +1793,7 @@ void *BCMATTACHFN(wlc_attach) (void *wl, u16 vendor, u16 device, ASSERT(sizeof(ht_cap_ie_t) == HT_CAP_IE_LEN); ASSERT(offsetof(wl_scan_params_t, channel_list) == WL_SCAN_PARAMS_FIXED_SIZE); - ASSERT(ISALIGNED(offsetof(wsec_key_t, data), sizeof(u32))); + ASSERT(IS_ALIGNED(offsetof(wsec_key_t, data), sizeof(u32))); ASSERT(ISPOWEROF2(MA_WINDOW_SZ)); ASSERT(sizeof(wlc_d11rxhdr_t) <= WL_HWRXOFF); @@ -4619,7 +4619,7 @@ wlc_iovar_op(wlc_info_t *wlc, const char *name, ASSERT(!set || (!params && !p_len)); if (!set && (len == sizeof(int)) && - !(ISALIGNED((uintptr) (arg), (uint) sizeof(int)))) { + !(IS_ALIGNED((uintptr) (arg), (uint) sizeof(int)))) { WL_ERROR(("wl%d: %s unaligned get ptr for %s\n", wlc->pub->unit, __func__, name)); ASSERT(0); @@ -6330,7 +6330,7 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw, } /* RTS PLCP header */ - ASSERT(ISALIGNED((uintptr) txh->RTSPhyHeader, sizeof(u16))); + ASSERT(IS_ALIGNED((uintptr) txh->RTSPhyHeader, sizeof(u16))); rts_plcp = txh->RTSPhyHeader; if (use_cts) rts_phylen = DOT11_CTS_LEN + DOT11_FCS_LEN; @@ -7176,7 +7176,7 @@ wlc_recvctl(wlc_info_t *wlc, osl_t *osh, d11rxhdr_t *rxh, void *p) ASSERT(!PKTNEXT(p)); ASSERT(!PKTLINK(p)); - ASSERT(ISALIGNED((uintptr) skb->data, 2)); + ASSERT(IS_ALIGNED((uintptr) skb->data, 2)); memcpy(IEEE80211_SKB_RXCB(p), &rx_status, sizeof(rx_status)); ieee80211_rx_irqsafe(wlc->pub->ieee_hw, p); |