| Message ID | 20231010205701.1585026-1-robh@kernel.org |
|---|---|
| State | Accepted |
| Commit | 7e909370a5cd44b4c16df500fb40762f48aae966 |
| Headers | show |
| Series | phy: realtek: Replace of_device.h with explicit includes | expand |
On Tue, 10 Oct 2023 15:57:00 -0500, Rob Herring 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 and pull in various other headers. In > preparation to fix this, adjust the includes for what is actually needed. > > of_device.h isn't needed, but platform_device.h was implicitly included by > it. > > [...] Applied, thanks! [1/1] phy: realtek: Replace of_device.h with explicit includes commit: 7e909370a5cd44b4c16df500fb40762f48aae966 Best regards,
diff --git a/drivers/phy/realtek/phy-rtk-usb2.c b/drivers/phy/realtek/phy-rtk-usb2.c index aedc78bd37f7..0a6426285c67 100644 --- a/drivers/phy/realtek/phy-rtk-usb2.c +++ b/drivers/phy/realtek/phy-rtk-usb2.c @@ -8,8 +8,8 @@ #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/of_address.h> +#include <linux/platform_device.h> #include <linux/uaccess.h> #include <linux/debugfs.h> #include <linux/nvmem-consumer.h> diff --git a/drivers/phy/realtek/phy-rtk-usb3.c b/drivers/phy/realtek/phy-rtk-usb3.c index dfb3122f3f11..67446a85e968 100644 --- a/drivers/phy/realtek/phy-rtk-usb3.c +++ b/drivers/phy/realtek/phy-rtk-usb3.c @@ -8,8 +8,8 @@ #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/of_address.h> +#include <linux/platform_device.h> #include <linux/uaccess.h> #include <linux/debugfs.h> #include <linux/nvmem-consumer.h>
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 and pull in various other headers. In preparation to fix this, adjust the includes for what is actually needed. of_device.h isn't needed, but platform_device.h was implicitly included by it. Signed-off-by: Rob Herring <robh@kernel.org> --- Note these were added in the merge window and missed the last round. --- drivers/phy/realtek/phy-rtk-usb2.c | 2 +- drivers/phy/realtek/phy-rtk-usb3.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)