Skip to contentSkip to conversation

Bluetooth: Replace IS_ERR_OR_NULL with IS_ERR

PATCH In review Aashish Sharma 3 participants 3 messages Aug 1, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Bluetooth: Replace IS_ERR_OR_NULL with IS_ERR

Since bt_skb_sendmsg never returns NULL, replace IS_ERR_OR_NULL with IS_ERR.

---
 include/net/bluetooth/bluetooth.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/bluetooth/bluetooth.h +1 -1
index 6b48d9e2aab9..a8b52175af05 100644
@@ -494,7 +494,7 @@ static inline struct sk_buff *bt_skb_sendmmsg(struct sock *sk,
 	struct sk_buff *skb, **frag;
 
 	skb = bt_skb_sendmsg(sk, msg, len, mtu, headroom, tailroom);
-	if (IS_ERR_OR_NULL(skb))
+	if (IS_ERR(skb))
 		return skb;
 
 	len -= skb->len;
Signature · 1 line
2.37.1.455.g008518b4e5-goog
#1 lore raw

This is an automated email and please do not reply to this email.

Dear Submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
While preparing the CI tests, the patches you submitted couldn't be applied to the current HEAD of the repository.

----- Output -----
error: patch failed: include/net/bluetooth/bluetooth.h:494
error: include/net/bluetooth/bluetooth.h: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch

Please resolve the issue and submit the patches again.

---
Regards,
Linux Bluetooth

Reviewed-by on v1 1/1
#2 lore raw
In reply to Aashish Sharma
Quoted 5 lines · Aashish Sharma

Since bt_skb_sendmsg never returns NULL, replace IS_ERR_OR_NULL with IS_ERR.

Quoted 20 lines
---
 include/net/bluetooth/bluetooth.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/bluetooth/bluetooth.h +1 -2
index 6b48d9e2aab9..a8b52175af05 100644
@@ -494,7 +494,7 @@ static inline struct sk_buff *bt_skb_sendmmsg(struct sock *sk,
        struct sk_buff *skb, **frag;
 
        skb = bt_skb_sendmsg(sk, msg, len, mtu, headroom, tailroom);
-       if (IS_ERR_OR_NULL(skb))
+       if (IS_ERR(skb))
                return skb;
 
        len -= skb->len;
--

2.37.1.455.g008518b4e5-goog