Bluetooth: hci_qca: don't use IS_ERR_OR_NULL() with gpiod_get_optional()
Subsystems (2)
PATCH 1/1 Bluetooth: hci_qca: don't use IS_ERR_OR_NULL() with gpiod_get_optional()
From: Bartosz Golaszewski <[email protected]>
The optional variants for the gpiod_get() family of functions return NULL if the GPIO in question is not associated with this device. They return ERR_PTR() on any other error. NULL descriptors are graciously handled by GPIOLIB and can be safely passed to any of the GPIO consumer interfaces as they will return 0 and act as if the function succeeded. If one is using the optional variant, then there's no point in checking for NULL.
--- drivers/bluetooth/hci_qca.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/bluetooth/hci_qca.c +3 -3
@@ -2326,7 +2326,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) qcadev->bt_en =devm_gpiod_get_optional (&serdev->dev,"enable" ,GPIOD_OUT_LOW ); -if (IS_ERR_OR_NULL (qcadev->bt_en) && +if (IS_ERR (qcadev->bt_en) && (data->soc_type ==QCA_WCN6750 || data->soc_type ==QCA_WCN6855 )) {dev_err (&serdev->dev,"failed to acquire BT_EN gpio\n" );
@@ -2335,7 +2335,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) qcadev->sw_ctrl =devm_gpiod_get_optional (&serdev->dev,"swctrl" ,GPIOD_IN ); -if (IS_ERR_OR_NULL (qcadev->sw_ctrl) && +if (IS_ERR (qcadev->sw_ctrl) && (data->soc_type ==QCA_WCN6750 || data->soc_type ==QCA_WCN6855 || data->soc_type ==QCA_WCN7850 ))
@@ -2357,7 +2357,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)default : qcadev->bt_en =devm_gpiod_get_optional (&serdev->dev,"enable" ,GPIOD_OUT_LOW ); -if (IS_ERR_OR_NULL (qcadev->bt_en)) { +if (IS_ERR (qcadev->bt_en)) {dev_warn (&serdev->dev,"failed to acquire enable gpio\n" ); power_ctrl_enabled = false; }
Signature · 1 line
2.40.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=824386
---Test result---
Test Summary:
CheckPatch PASS 1.18 seconds GitLint PASS 0.20 seconds SubjectPrefix PASS 0.07 seconds BuildKernel PASS 27.94 seconds CheckAllWarning PASS 30.43 seconds CheckSparse PASS 36.13 seconds CheckSmatch PASS 97.84 seconds BuildKernel32 PASS 26.85 seconds TestRunnerSetup PASS 499.91 seconds TestRunner_l2cap-tester PASS 39.72 seconds TestRunner_iso-tester PASS 30.92 seconds TestRunner_bnep-tester PASS 4.94 seconds TestRunner_mgmt-tester FAIL 174.03 seconds TestRunner_rfcomm-tester PASS 7.44 seconds TestRunner_sco-tester PASS 14.98 seconds TestRunner_ioctl-tester PASS 7.93 seconds TestRunner_mesh-tester PASS 5.89 seconds TestRunner_smp-tester PASS 6.86 seconds TestRunner_userchan-tester PASS 5.00 seconds IncrementalBuild PASS 26.04 seconds
Details
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner Output:
Total: 492, Passed: 487 (99.0%), Failed: 4, Not Run: 1
Failed Test Cases
LL Privacy - Add Device 4 (2 Devices to AL) Failed 0.114 seconds LL Privacy - Add Device 5 (2 Devices to RL) Failed 0.115 seconds LL Privacy - Add Device 6 (RL is full) Failed 0.142 seconds LL Privacy - Add Device 7 (AL is full) Failed 0.147 seconds
---
Regards,
Linux Bluetooth
Quoted 48 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
The optional variants for the
gpiod_get()family of functions return NULL if the GPIO in question is not associated with this device. They returnERR_PTR()on any other error. NULL descriptors are graciously handled by GPIOLIB and can be safely passed to any of the GPIO consumer interfaces as they will return 0 and act as if the function succeeded. If one is using the optional variant, then there's no point in checking for NULL.Fixes 6845667146a2 ("Bluetooth: hci_qca: Fix NULL vs IS_ERR_OR_NULL check in qca_serdev_probe")Signed-off-by Bartosz Golaszewski <[email protected]>--- drivers/bluetooth/hci_qca.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/bluetooth/hci_qca.c +3
-4@@ -2326,7 +2326,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) qcadev->bt_en =devm_gpiod_get_optional (&serdev->dev,"enable" ,GPIOD_OUT_LOW ); -if (IS_ERR_OR_NULL (qcadev->bt_en) && +if (IS_ERR (qcadev->bt_en) && (data->soc_type ==QCA_WCN6750 || data->soc_type ==QCA_WCN6855 )) {dev_err (&serdev->dev,"failed to acquire BT_EN gpio\n" );@@ -2335,7 +2335,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) qcadev->sw_ctrl =devm_gpiod_get_optional (&serdev->dev,"swctrl" ,GPIOD_IN ); -if (IS_ERR_OR_NULL (qcadev->sw_ctrl) && +if (IS_ERR (qcadev->sw_ctrl) && (data->soc_type ==QCA_WCN6750 || data->soc_type ==QCA_WCN6855 || data->soc_type ==QCA_WCN7850 ))@@ -2357,7 +2357,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)default : qcadev->bt_en =devm_gpiod_get_optional (&serdev->dev,"enable" ,GPIOD_OUT_LOW ); -if (IS_ERR_OR_NULL (qcadev->bt_en)) { +if (IS_ERR (qcadev->bt_en)) {dev_warn (&serdev->dev,"failed to acquire enable gpio\n" ); power_ctrl_enabled = false; } --
Quoted 2 lines
2.40.1
Gentle ping.
Bartosz
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 10 lines · On Thu, 8 Feb 2024 17:40:17 +0100 you wrote:
From: Bartosz Golaszewski <[email protected]>
The optional variants for the
gpiod_get()family of functions return NULL if the GPIO in question is not associated with this device. They returnERR_PTR()on any other error. NULL descriptors are graciously handled by GPIOLIB and can be safely passed to any of the GPIO consumer interfaces as they will return 0 and act as if the function succeeded. If one is using the optional variant, then there's no point in checking for NULL.[...]
Here is the summary with links:
- Bluetooth: hci_qca: don't use IS_ERR_OR_NULL() with gpiod_get_optional()
https://git.kernel.org/bluetooth/bluetooth-next/c/75518da8cf76
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html