Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1762c17c9c38ed21090bee8cd02e2b470c5c2308

Authored by Samuel Ortiz
Committed by John W. Linville
1 parent 53a0ac2ee8
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

NFC: Fix bitops usage in LLCP 

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 1 changed file with 10 additions and 10 deletions Side-by-side Diff

... ... @@ -176,7 +176,7 @@
176 176 return LLCP_SAP_MAX;
177 177 }
178 178  
179   - set_bit(BIT(ssap), &local->local_wks);
  179 + set_bit(ssap, &local->local_wks);
180 180 mutex_unlock(&local->sdp_lock);
181 181  
182 182 return ssap;
183 183  
184 184  
... ... @@ -195,25 +195,25 @@
195 195  
196 196 pr_debug("SDP ssap %d\n", LLCP_WKS_NUM_SAP + ssap);
197 197  
198   - set_bit(BIT(ssap), &local->local_sdp);
  198 + set_bit(ssap, &local->local_sdp);
199 199 mutex_unlock(&local->sdp_lock);
200 200  
201 201 return LLCP_WKS_NUM_SAP + ssap;
202 202  
203 203 } else if (sock->ssap != 0) {
204 204 if (sock->ssap < LLCP_WKS_NUM_SAP) {
205   - if (!(local->local_wks & BIT(sock->ssap))) {
206   - set_bit(BIT(sock->ssap), &local->local_wks);
  205 + if (!test_bit(sock->ssap, &local->local_wks)) {
  206 + set_bit(sock->ssap, &local->local_wks);
207 207 mutex_unlock(&local->sdp_lock);
208 208  
209 209 return sock->ssap;
210 210 }
211 211  
212 212 } else if (sock->ssap < LLCP_SDP_NUM_SAP) {
213   - if (!(local->local_sdp &
214   - BIT(sock->ssap - LLCP_WKS_NUM_SAP))) {
215   - set_bit(BIT(sock->ssap - LLCP_WKS_NUM_SAP),
216   - &local->local_sdp);
  213 + if (!test_bit(sock->ssap - LLCP_WKS_NUM_SAP,
  214 + &local->local_sdp)) {
  215 + set_bit(sock->ssap - LLCP_WKS_NUM_SAP,
  216 + &local->local_sdp);
217 217 mutex_unlock(&local->sdp_lock);
218 218  
219 219 return sock->ssap;
... ... @@ -238,7 +238,7 @@
238 238 return LLCP_SAP_MAX;
239 239 }
240 240  
241   - set_bit(BIT(local_ssap), &local->local_sap);
  241 + set_bit(local_ssap, &local->local_sap);
242 242  
243 243 mutex_unlock(&local->sdp_lock);
244 244  
... ... @@ -265,7 +265,7 @@
265 265  
266 266 mutex_lock(&local->sdp_lock);
267 267  
268   - clear_bit(1 << local_ssap, sdp);
  268 + clear_bit(local_ssap, sdp);
269 269  
270 270 mutex_unlock(&local->sdp_lock);
271 271 }