diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-08 11:55:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-08 11:55:40 -0700 |
| commit | 36c63ff6afb1bdc2d93aac6d207d6529177d47f8 (patch) | |
| tree | 7831c526e0914325e479302964dd00dc518d1862 /drivers/staging/brcm80211/util/hnddma.c | |
| parent | d2733c97faf94ae22f214f3cfb288da3366e6ad5 (diff) | |
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/util/hnddma.c')
| -rw-r--r-- | drivers/staging/brcm80211/util/hnddma.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c index 3bc6a717b10c..8151bd43d1aa 100644 --- a/drivers/staging/brcm80211/util/hnddma.c +++ b/drivers/staging/brcm80211/util/hnddma.c @@ -1132,7 +1132,7 @@ static bool BCMFASTPATH _dma_rxfill(dma_info_t *di) pa = DMA_MAP(di->osh, PKTDATA(p), di->rxbufsize, DMA_RX, p, &di->rxp_dmah[rxout]); - ASSERT(ISALIGNED(PHYSADDRLO(pa), 4)); + ASSERT(IS_ALIGNED(PHYSADDRLO(pa), 4)); /* save the free packet pointer */ ASSERT(di->rxp[rxout] == NULL); @@ -1553,7 +1553,7 @@ static bool dma32_alloc(dma_info_t *di, uint direction) ASSERT(PHYSADDRLO(di->txdpa) >= PHYSADDRLO(di->txdpaorig)); di->txdalloc = alloced; - ASSERT(ISALIGNED((uintptr) di->txd32, align)); + ASSERT(IS_ALIGNED((uintptr) di->txd32, align)); } else { va = dma_ringalloc(di->osh, D32RINGALIGN, size, &align_bits, &alloced, &di->rxdpaorig, &di->rx_dmah); @@ -1573,7 +1573,7 @@ static bool dma32_alloc(dma_info_t *di, uint direction) /* Make sure that alignment didn't overflow */ ASSERT(PHYSADDRLO(di->rxdpa) >= PHYSADDRLO(di->rxdpaorig)); di->rxdalloc = alloced; - ASSERT(ISALIGNED((uintptr) di->rxd32, align)); + ASSERT(IS_ALIGNED((uintptr) di->rxd32, align)); } return TRUE; @@ -2118,7 +2118,7 @@ static bool dma64_alloc(dma_info_t *di, uint direction) PHYSADDRHISET(di->txdpa, PHYSADDRHI(di->txdpaorig)); di->txdalloc = alloced; - ASSERT(ISALIGNED((uintptr) di->txd64, align)); + ASSERT(IS_ALIGNED((uintptr) di->txd64, align)); } else { va = dma_ringalloc(di->osh, D64RINGALIGN, size, &align_bits, &alloced, &di->rxdpaorig, &di->rx_dmah); @@ -2136,7 +2136,7 @@ static bool dma64_alloc(dma_info_t *di, uint direction) PHYSADDRHISET(di->rxdpa, PHYSADDRHI(di->rxdpaorig)); di->rxdalloc = alloced; - ASSERT(ISALIGNED((uintptr) di->rxd64, align)); + ASSERT(IS_ALIGNED((uintptr) di->rxd64, align)); } return TRUE; |