Skip to content

Commit 060f03e

Browse files
robherringLinus Walleij
robherring
authored and
Linus Walleij
committed
pinctrl: Explicitly include correct DT includes
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> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Acked-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/r/20230714174901.4062397-1-robh@kernel.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 parent 59d612a commit 060f03e

107 files changed

Lines changed: 80 additions & 145 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎drivers/pinctrl/bcm/pinctrl-iproc-gpio.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include <linux/io.h>
2222
#include <linux/ioport.h>
2323
#include <linux/kernel.h>
24-
#include <linux/of_device.h>
25-
#include <linux/of_irq.h>
24+
#include <linux/of.h>
25+
#include <linux/platform_device.h>
2626
#include <linux/seq_file.h>
2727
#include <linux/slab.h>
2828

‎drivers/pinctrl/bcm/pinctrl-nsp-gpio.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
#include <linux/io.h>
1616
#include <linux/ioport.h>
1717
#include <linux/kernel.h>
18-
#include <linux/of_address.h>
19-
#include <linux/of_device.h>
20-
#include <linux/of_irq.h>
18+
#include <linux/of.h>
2119
#include <linux/pinctrl/pinconf.h>
2220
#include <linux/pinctrl/pinconf-generic.h>
2321
#include <linux/pinctrl/pinctrl.h>
22+
#include <linux/platform_device.h>
2423
#include <linux/slab.h>
2524

2625
#include "../pinctrl-utils.h"

‎drivers/pinctrl/freescale/pinctrl-imx.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/module.h>
1515
#include <linux/of.h>
1616
#include <linux/of_address.h>
17-
#include <linux/of_device.h>
17+
#include <linux/platform_device.h>
1818
#include <linux/regmap.h>
1919
#include <linux/seq_file.h>
2020
#include <linux/slab.h>

‎drivers/pinctrl/freescale/pinctrl-imx1-core.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
#include <linux/init.h>
1616
#include <linux/io.h>
1717
#include <linux/of.h>
18-
#include <linux/of_device.h>
18+
#include <linux/of_platform.h>
19+
#include <linux/platform_device.h>
1920
#include <linux/seq_file.h>
2021
#include <linux/slab.h>
2122

‎drivers/pinctrl/freescale/pinctrl-imx23.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
// Copyright 2012 Freescale Semiconductor, Inc.
77

88
#include <linux/init.h>
9-
#include <linux/of_device.h>
9+
#include <linux/mod_devicetable.h>
10+
#include <linux/platform_device.h>
1011
#include <linux/pinctrl/pinctrl.h>
1112
#include "pinctrl-mxs.h"
1213

‎drivers/pinctrl/freescale/pinctrl-imx25.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include <linux/err.h>
1515
#include <linux/init.h>
1616
#include <linux/io.h>
17-
#include <linux/of.h>
18-
#include <linux/of_device.h>
17+
#include <linux/mod_devicetable.h>
18+
#include <linux/platform_device.h>
1919
#include <linux/pinctrl/pinctrl.h>
2020

2121
#include "pinctrl-imx.h"

‎drivers/pinctrl/freescale/pinctrl-imx27.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include <linux/err.h>
1010
#include <linux/init.h>
1111
#include <linux/io.h>
12-
#include <linux/of.h>
13-
#include <linux/of_device.h>
12+
#include <linux/mod_devicetable.h>
13+
#include <linux/platform_device.h>
1414
#include <linux/pinctrl/pinctrl.h>
1515

1616
#include "pinctrl-imx1.h"

‎drivers/pinctrl/freescale/pinctrl-imx28.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
// Copyright 2012 Freescale Semiconductor, Inc.
77

88
#include <linux/init.h>
9-
#include <linux/of_device.h>
9+
#include <linux/mod_devicetable.h>
10+
#include <linux/platform_device.h>
1011
#include <linux/pinctrl/pinctrl.h>
1112
#include "pinctrl-mxs.h"
1213

‎drivers/pinctrl/freescale/pinctrl-imx35.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include <linux/err.h>
1313
#include <linux/init.h>
1414
#include <linux/io.h>
15-
#include <linux/of.h>
16-
#include <linux/of_device.h>
15+
#include <linux/mod_devicetable.h>
16+
#include <linux/platform_device.h>
1717
#include <linux/pinctrl/pinctrl.h>
1818

1919
#include "pinctrl-imx.h"

‎drivers/pinctrl/freescale/pinctrl-imx50.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include <linux/err.h>
1010
#include <linux/init.h>
1111
#include <linux/io.h>
12-
#include <linux/of.h>
13-
#include <linux/of_device.h>
12+
#include <linux/mod_devicetable.h>
13+
#include <linux/platform_device.h>
1414
#include <linux/pinctrl/pinctrl.h>
1515

1616
#include "pinctrl-imx.h"

0 commit comments

Comments
 (0)