summaryrefslogtreecommitdiffstats
path: root/drivers/staging/brcm80211/util/bcmotp.c
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2010-12-02 15:44:51 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-02 12:34:09 -0800
commitdfa26436109d06f233a0ad735731cfb2d0c6ab5a (patch)
tree0e87d36ce6a167f45b03204a394e48d3c0febbd8 /drivers/staging/brcm80211/util/bcmotp.c
parent92246bcbd7730eaaec0c29a2adc1cb4b4451ed9e (diff)
downloadop-kernel-dev-dfa26436109d06f233a0ad735731cfb2d0c6ab5a.zip
op-kernel-dev-dfa26436109d06f233a0ad735731cfb2d0c6ab5a.tar.gz
staging: brcm80211: remove redundant CHIPID macro
The CHIPID macro simply expands to the macro argument so it is redundant and as such removed. Reviewed-by: Roland Vossen <rvossen@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/util/bcmotp.c')
-rw-r--r--drivers/staging/brcm80211/util/bcmotp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/util/bcmotp.c
index 3c625c8..d820e7b 100644
--- a/drivers/staging/brcm80211/util/bcmotp.c
+++ b/drivers/staging/brcm80211/util/bcmotp.c
@@ -223,7 +223,7 @@ static int ipxotp_max_rgnsz(si_t *sih, int osizew)
{
int ret = 0;
- switch (CHIPID(sih->chip)) {
+ switch (sih->chip) {
case BCM43224_CHIP_ID:
case BCM43225_CHIP_ID:
ret = osizew * 2 - OTP_SZ_FU_72 - OTP_SZ_CHECKSUM;
@@ -273,8 +273,8 @@ static void _ipxotp_init(otpinfo_t *oi, chipcregs_t *cc)
/* Read OTP lock bits and subregion programmed indication bits */
oi->status = R_REG(oi->osh, &cc->otpstatus);
- if ((CHIPID(oi->sih->chip) == BCM43224_CHIP_ID)
- || (CHIPID(oi->sih->chip) == BCM43225_CHIP_ID)) {
+ if ((oi->sih->chip == BCM43224_CHIP_ID)
+ || (oi->sih->chip == BCM43225_CHIP_ID)) {
u32 p_bits;
p_bits =
(ipxotp_otpr(oi, cc, oi->otpgu_base + OTPGU_P_OFF) &
OpenPOWER on IntegriCloud