summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-07-21 22:36:06 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-07-26 21:09:03 +0200
commit28eb3e5acfddf1e1c8892df9901e4f32f7f537eb (patch)
treeecfb4513e99fc6b76c765c5c738e27a51d80cdf7
parentrtl8180: improve signal reporting for actual rtl8180 hardware (diff)
downloadlinux-28eb3e5acfddf1e1c8892df9901e4f32f7f537eb.tar.xz
linux-28eb3e5acfddf1e1c8892df9901e4f32f7f537eb.zip
rtl8180: silence "dubious: x | !y" sparse warning
CHECK drivers/net/wireless/rtl818x/rtl8180_rtl8225.c drivers/net/wireless/rtl818x/rtl8180_rtl8225.c:53:33: warning: dubious: x | !y The existing code is clever and works fine, but it's not worth even a single line of Sparse warning SPAM... Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rtl818x/rtl8180_rtl8225.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c b/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
index 4d2be0d9672b..69e4d4745dae 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
@@ -50,7 +50,10 @@ static void rtl8225_write(struct ieee80211_hw *dev, u8 addr, u16 data)
udelay(10);
for (i = 15; i >= 0; i--) {
- u16 reg = reg80 | !!(bangdata & (1 << i));
+ u16 reg = reg80;
+
+ if (bangdata & (1 << i))
+ reg |= 1;
if (i & 1)
rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg);