bluetooth: btintel_pcie: nonsense error recording in irq

Commit Message

Oliver Neukum May 16, 2024, 4:50 a.m. UTC

Either you return an error or you ignore it.
Recording it but then overwriting it makes no sense.

Signed-off-by: Oliver Neukum <[e-mail]>
---
 drivers/bluetooth/btintel_pcie.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

[e-mail] May 16, 2024, 5:33 a.m. UTC | #1

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=853575

---Test result---

Test Summary:
CheckPatch                    PASS      0.64 seconds
GitLint                       PASS      0.30 seconds
SubjectPrefix                 FAIL      0.47 seconds
BuildKernel                   PASS      30.54 seconds
CheckAllWarning               PASS      33.41 seconds
CheckSparse                   PASS      38.03 seconds
CheckSmatch                   FAIL      35.28 seconds
BuildKernel32                 PASS      28.82 seconds
TestRunnerSetup               PASS      519.42 seconds
TestRunner_l2cap-tester       PASS      20.24 seconds
TestRunner_iso-tester         PASS      30.48 seconds
TestRunner_bnep-tester        PASS      4.70 seconds
TestRunner_mgmt-tester        PASS      110.01 seconds
TestRunner_rfcomm-tester      PASS      7.22 seconds
TestRunner_sco-tester         PASS      14.91 seconds
TestRunner_ioctl-tester       PASS      7.73 seconds
TestRunner_mesh-tester        PASS      5.84 seconds
TestRunner_smp-tester         PASS      6.74 seconds
TestRunner_userchan-tester    PASS      6.93 seconds
IncrementalBuild              PASS      27.88 seconds

Details
##############################
Test: SubjectPrefix - FAIL
Desc: Check subject contains "Bluetooth" prefix
Output:
"Bluetooth: " prefix is not specified in the subject
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:

Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: net/bluetooth/hci_core.o] Error 139
make[4]: *** Deleting file 'net/bluetooth/hci_core.o'
make[3]: *** [scripts/Makefile.build:485: net/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:485: net] Error 2
make[2]: *** Waiting for unfinished jobs....
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: drivers/bluetooth/bcm203x.o] Error 139
make[4]: *** Deleting file 'drivers/bluetooth/bcm203x.o'
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [scripts/Makefile.build:485: drivers/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:485: drivers] Error 2
make[1]: *** [/github/workspace/src/src/Makefile:1919: .] Error 2
make: *** [Makefile:240: __sub-make] Error 2


---
Regards,
Linux Bluetooth

Paul Menzel May 16, 2024, 5:44 a.m. UTC | #2

[Cc: +Kiran]

Dear Oliver,


Thank you for the patch. I have two minor comments. Could you please 
word the summary as a statement by adding a verb (in imperative mood). 
Maybe:

 > Fix nonsense …

or

 > Remove unused `ret` assignment

Am 16.05.24 um 06:50 schrieb Oliver Neukum:
> Either you return an error or you ignore it.
> Recording it but then overwriting it makes no sense.
It’d be great if you added a Fixes: tag.

> Signed-off-by: Oliver Neukum <[e-mail]>
> ---
>   drivers/bluetooth/btintel_pcie.c | 8 ++------
>   1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c
> index 590c188a4bb3..c507422d6b1b 100644
> --- a/drivers/bluetooth/btintel_pcie.c
> +++ b/drivers/bluetooth/btintel_pcie.c
> @@ -498,19 +498,15 @@ static int btintel_pcie_submit_rx_work(struct btintel_pcie_data *data, u8 status
>   	rfh_hdr = buf;
>   
>   	len = rfh_hdr->packet_len;
> -	if (len <= 0) {
> -		ret = -EINVAL;
> +	if (len <= 0)
>   		goto resubmit;
> -	}
>   
>   	/* Remove RFH header */
>   	buf += sizeof(*rfh_hdr);
>   
>   	skb = alloc_skb(len, GFP_ATOMIC);
> -	if (!skb) {
> -		ret = -ENOMEM;
> +	if (!skb)
>   		goto resubmit;
> -	}
>   
>   	skb_put_data(skb, buf, len);
>   	skb_queue_tail(&data->rx_skb_q, skb);


Kind regards,

Paul

Patch

diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c
index 590c188a4bb3..c507422d6b1b 100644
--- a/drivers/bluetooth/btintel_pcie.c
+++ b/drivers/bluetooth/btintel_pcie.c
@@ -498,19 +498,15 @@  static int btintel_pcie_submit_rx_work(struct btintel_pcie_data *data, u8 status
 	rfh_hdr = buf;
 
 	len = rfh_hdr->packet_len;
-	if (len <= 0) {
-		ret = -EINVAL;
+	if (len <= 0)
 		goto resubmit;
-	}
 
 	/* Remove RFH header */
 	buf += sizeof(*rfh_hdr);
 
 	skb = alloc_skb(len, GFP_ATOMIC);
-	if (!skb) {
-		ret = -ENOMEM;
+	if (!skb)
 		goto resubmit;
-	}
 
 	skb_put_data(skb, buf, len);
 	skb_queue_tail(&data->rx_skb_q, skb);