Message ID | 20220302192523.57444-5-krzysztof.kozlowski@canonical.com (mailing list archive) |
---|---|
State | Accepted |
Commit | a736491239f4b434fc76a2ba0c1bdb8eaf9eb792 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | nfc: llcp: few cleanups/improvements | expand |
From: Krzysztof Kozlowski > Sent: 02 March 2022 19:25 > > Use test_bit() instead of open-coding it, just like in other places > touching the bitmap. Except it isn't a bitmap, it is just a structure member that contains bits. So all the other places should be changes to use C shifts and masks (etc). David > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> > --- > net/nfc/llcp_core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c > index 5ad5157aa9c5..b70d5042bf74 100644 > --- a/net/nfc/llcp_core.c > +++ b/net/nfc/llcp_core.c > @@ -383,7 +383,7 @@ u8 nfc_llcp_get_sdp_ssap(struct nfc_llcp_local *local, > pr_debug("WKS %d\n", ssap); > > /* This is a WKS, let's check if it's free */ > - if (local->local_wks & BIT(ssap)) { > + if (test_bit(ssap, &local->local_wks)) { > mutex_unlock(&local->sdp_lock); > > return LLCP_SAP_MAX; > -- > 2.32.0 - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
On 03/03/2022 01:10, David Laight wrote: > From: Krzysztof Kozlowski >> Sent: 02 March 2022 19:25 >> >> Use test_bit() instead of open-coding it, just like in other places >> touching the bitmap. > > Except it isn't a bitmap, it is just a structure member that contains bits. > So all the other places should be changes to use C shifts and masks (etc). > It's not declared as bitmap but it is unsigned long, so an appropriate type (and same type) for test_bit. Best regards, Krzysztof
diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c index 5ad5157aa9c5..b70d5042bf74 100644 --- a/net/nfc/llcp_core.c +++ b/net/nfc/llcp_core.c @@ -383,7 +383,7 @@ u8 nfc_llcp_get_sdp_ssap(struct nfc_llcp_local *local, pr_debug("WKS %d\n", ssap); /* This is a WKS, let's check if it's free */ - if (local->local_wks & BIT(ssap)) { + if (test_bit(ssap, &local->local_wks)) { mutex_unlock(&local->sdp_lock); return LLCP_SAP_MAX;
Use test_bit() instead of open-coding it, just like in other places touching the bitmap. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> --- net/nfc/llcp_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)