Bluetooth: btintel_pcie: fix CONFIG_PM_SLEEP check
PATCH 1/1 Bluetooth: btintel_pcie: fix CONFIG_PM_SLEEP check
From: Arnd Bergmann <[email protected]>
Using both pm_sleep_ptr() and an #ifdef around the definition is not valid:
In file included from include/linux/kernel.h:36,
from drivers/bluetooth/btintel_pcie.c:9:drivers/bluetooth/btintel_pcie.c:2674:36: error: 'btintel_pcie_pm_ops' undeclared here (not in a function); did you mean 'btintel_pcie_in_op'?
2674 | .driver.pm = pm_sleep_ptr(&btintel_pcie_pm_ops),
| ^~~~~~~~~~~~~~~~~~~
Remove the #ifdef check to let the compiler's dead-code-elimination drop this as intended by pm_sleep_ptr().
--- drivers/bluetooth/btintel_pcie.c | 2 -- 1 file changed, 2 deletions(-)
drivers/bluetooth/btintel_pcie.c +0 -2
@@ -2574,7 +2574,6 @@ static void btintel_pcie_coredump(struct device *dev) }#endif -#ifdef CONFIG_PM_SLEEP static int btintel_pcie_suspend_late (struct device *dev,pm_message_t mesg) {struct pci_dev *pdev =to_pci_dev (dev);
@@ -2664,7 +2663,6 @@ static const struct dev_pm_ops btintel_pcie_pm_ops = { .poweroff = btintel_pcie_hibernate, .restore = btintel_pcie_resume, }; -#endif static struct pci_driver btintel_pcie_driver = { .name =KBUILD_MODNAME ,
Signature · 1 line
2.39.5
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=986771
---Test result---
Test Summary:
CheckPatch PENDING 0.39 seconds GitLint PENDING 0.41 seconds SubjectPrefix PASS 0.06 seconds BuildKernel PASS 24.37 seconds CheckAllWarning PASS 26.83 seconds CheckSparse PASS 30.58 seconds BuildKernel32 PASS 24.33 seconds TestRunnerSetup PASS 485.71 seconds TestRunner_l2cap-tester PASS 24.99 seconds TestRunner_iso-tester PASS 37.95 seconds TestRunner_bnep-tester PASS 5.93 seconds TestRunner_mgmt-tester FAIL 128.69 seconds TestRunner_rfcomm-tester PASS 9.37 seconds TestRunner_sco-tester PASS 14.76 seconds TestRunner_ioctl-tester PASS 10.01 seconds TestRunner_mesh-tester FAIL 11.64 seconds TestRunner_smp-tester PASS 8.51 seconds TestRunner_userchan-tester PASS 6.18 seconds IncrementalBuild PENDING 0.75 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner Output:
Total: 490, Passed: 485 (99.0%), Failed: 1, Not Run: 4
Failed Test Cases
LL Privacy - Set Flags 4 (RL is full) Failed 0.278 seconds
##############################
Test: TestRunner_mesh-tester - FAIL
Desc: Run mesh-tester with test-runner Output:
Total: 10, Passed: 8 (80.0%), Failed: 2, Not Run: 0
Failed Test Cases
Mesh - Send cancel - 1 Timed out 2.057 seconds Mesh - Send cancel - 2 Timed out 2.000 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:
---
Regards,
Linux Bluetooth
Luiz Augusto von Dentz
maintainerHi Arnd,
Quoted 10 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Using both
pm_sleep_ptr()and an #ifdef around the definition is not valid:In file included from
include/linux/kernel.h:36,
fromdrivers/bluetooth/btintel_pcie.c:9:drivers/bluetooth/btintel_pcie.c:2674:36: error: 'btintel_pcie_pm_ops' undeclared here (not in a function); did you mean 'btintel_pcie_in_op'?
2674 | .driver.pm =pm_sleep_ptr(&btintel_pcie_pm_ops),
Quoted 7 lines
| ^~~~~~~~~~~~~~~~~~~Remove the #ifdef check to let the compiler's dead-code-elimination drop this as intended by
pm_sleep_ptr().Fixes d1b3de23042b ("Bluetooth: btintel_pcie: Add support for _suspend() / _resume()")Signed-off-by Arnd Bergmann <[email protected]>
Ive fixed it up in place since this hasn't been merged yet, thanks.
Quoted 27 lines
--- drivers/bluetooth/btintel_pcie.c | 2 -- 1 file changed, 2 deletions(-)drivers/bluetooth/btintel_pcie.c +0
-3@@ -2574,7 +2574,6 @@ static void btintel_pcie_coredump(struct device *dev) }#endif -#ifdef CONFIG_PM_SLEEP static int btintel_pcie_suspend_late (struct device *dev,pm_message_t mesg) {struct pci_dev *pdev =to_pci_dev (dev);@@ -2664,7 +2663,6 @@ static const struct dev_pm_ops btintel_pcie_pm_ops = { .poweroff = btintel_pcie_hibernate, .restore = btintel_pcie_resume, }; -#endif static struct pci_driver btintel_pcie_driver = { .name =KBUILD_MODNAME , --2.39.5
Signature · 1 line
Luiz Augusto von Dentz