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/brcmfmac | |
| parent | d2733c97faf94ae22f214f3cfb288da3366e6ad5 (diff) | |
| download | op-kernel-dev-36c63ff6afb1bdc2d93aac6d207d6529177d47f8.zip op-kernel-dev-36c63ff6afb1bdc2d93aac6d207d6529177d47f8.tar.gz | |
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/brcmfmac')
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmutils.c | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmutils.c b/drivers/staging/brcm80211/brcmfmac/bcmutils.c index 1bc7b5e..8572fe6 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmutils.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmutils.c @@ -883,7 +883,7 @@ uint pktsetprio(void *pkt, bool update_vtag) int rc = 0; pktdata = (u8 *) PKTDATA(pkt); - ASSERT(ISALIGNED((uintptr) pktdata, sizeof(u16))); + ASSERT(IS_ALIGNED((uintptr) pktdata, sizeof(u16))); eh = (struct ether_header *)pktdata; diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 4eed29f..a133faf 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -1087,7 +1087,7 @@ int dhd_bus_txdata(struct dhd_bus *bus, void *pkt) /* Add space for the header */ PKTPUSH(pkt, SDPCM_HDRLEN); - ASSERT(ISALIGNED((uintptr) PKTDATA(pkt), 2)); + ASSERT(IS_ALIGNED((uintptr) PKTDATA(pkt), 2)); prec = PRIO2PREC((PKTPRIO(pkt) & PRIOMASK)); @@ -1265,7 +1265,7 @@ int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen) if (forcealign && (len & (ALIGNMENT - 1))) len = ROUNDUP(len, ALIGNMENT); - ASSERT(ISALIGNED((uintptr) frame, 2)); + ASSERT(IS_ALIGNED((uintptr) frame, 2)); /* Need to lock here to protect txseq and SDIO tx calls */ dhd_os_sdlock(bus->dhd); |
