diff mbox series

bluetooth: Explicitly include correct DT includes

Message ID 20230714174057.4041063-1-robh@kernel.org
State Accepted
Commit f0eecb651f964da87235836157df953fc5318b9a
Headers show
Series bluetooth: Explicitly include correct DT includes | expand

Commit Message

Rob Herring (Arm) July 14, 2023, 5:40 p.m. UTC
The DT of_device.h and of_platform.h date back to the separate
of_platform_bus_type before it as merged into the regular platform bus.
As part of that merge prepping Arm DT support 13 years ago, they
"temporarily" include each other. They also include platform_device.h
and of.h. As a result, there's a pretty much random mix of those include
files used throughout the tree. In order to detangle these headers and
replace the implicit includes with struct declarations, users need to
explicitly include the correct includes.

Signed-off-by: Rob Herring <robh@kernel.org>
---
 drivers/bluetooth/btmtkuart.c | 1 -
 drivers/bluetooth/hci_h5.c    | 2 +-
 drivers/bluetooth/hci_qca.c   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

Comments

bluez.test.bot@gmail.com July 14, 2023, 6:44 p.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=765817

---Test result---

Test Summary:
CheckPatch                    PASS      1.15 seconds
GitLint                       PASS      0.36 seconds
SubjectPrefix                 FAIL      0.36 seconds
BuildKernel                   PASS      42.45 seconds
CheckAllWarning               PASS      45.71 seconds
CheckSparse                   PASS      51.96 seconds
CheckSmatch                   PASS      138.88 seconds
BuildKernel32                 PASS      40.47 seconds
TestRunnerSetup               PASS      618.07 seconds
TestRunner_l2cap-tester       PASS      29.54 seconds
TestRunner_iso-tester         PASS      61.30 seconds
TestRunner_bnep-tester        PASS      13.65 seconds
TestRunner_mgmt-tester        FAIL      264.78 seconds
TestRunner_rfcomm-tester      PASS      21.98 seconds
TestRunner_sco-tester         PASS      22.34 seconds
TestRunner_ioctl-tester       PASS      24.60 seconds
TestRunner_mesh-tester        PASS      17.53 seconds
TestRunner_smp-tester         PASS      20.10 seconds
TestRunner_userchan-tester    PASS      15.69 seconds
IncrementalBuild              PASS      40.44 seconds

Details
##############################
Test: SubjectPrefix - FAIL
Desc: Check subject contains "Bluetooth" prefix
Output:
"Bluetooth: " prefix is not specified in the subject
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 497, Passed: 495 (99.6%), Failed: 2, Not Run: 0

Failed Test Cases
LL Privacy - Unpair 1                                Timed out    1.995 seconds
LL Privacy - Unpair 2 (Remove from AL)               Timed out    4.985 seconds


---
Regards,
Linux Bluetooth
patchwork-bot+bluetooth@kernel.org July 20, 2023, 11:50 p.m. UTC | #2
Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Fri, 14 Jul 2023 11:40:57 -0600 you wrote:
> The DT of_device.h and of_platform.h date back to the separate
> of_platform_bus_type before it as merged into the regular platform bus.
> As part of that merge prepping Arm DT support 13 years ago, they
> "temporarily" include each other. They also include platform_device.h
> and of.h. As a result, there's a pretty much random mix of those include
> files used throughout the tree. In order to detangle these headers and
> replace the implicit includes with struct declarations, users need to
> explicitly include the correct includes.
> 
> [...]

Here is the summary with links:
  - bluetooth: Explicitly include correct DT includes
    https://git.kernel.org/bluetooth/bluetooth-next/c/f0eecb651f96

You are awesome, thank you!
diff mbox series

Patch

diff --git a/drivers/bluetooth/btmtkuart.c b/drivers/bluetooth/btmtkuart.c
index 7680c67cdb35..935feab815d9 100644
--- a/drivers/bluetooth/btmtkuart.c
+++ b/drivers/bluetooth/btmtkuart.c
@@ -17,7 +17,6 @@ 
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index fefc37b98b4a..71e748a9477e 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -11,7 +11,7 @@ 
 #include <linux/gpio/consumer.h>
 #include <linux/kernel.h>
 #include <linux/mod_devicetable.h>
-#include <linux/of_device.h>
+#include <linux/of.h>
 #include <linux/pm_runtime.h>
 #include <linux/serdev.h>
 #include <linux/skbuff.h>
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index e30c979535b1..dcab942fa5a2 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -25,7 +25,7 @@ 
 #include <linux/gpio/consumer.h>
 #include <linux/mod_devicetable.h>
 #include <linux/module.h>
-#include <linux/of_device.h>
+#include <linux/of.h>
 #include <linux/acpi.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>