Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

power: 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.

Acked-by: David Lechner <david@lechnology.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

authored by

Rob Herring and committed by
Sebastian Reichel
2ce8284c 06c2afb8

+26 -37
-1
drivers/power/reset/as3722-poweroff.c
··· 10 10 #include <linux/mfd/as3722.h> 11 11 #include <linux/module.h> 12 12 #include <linux/of.h> 13 - #include <linux/of_device.h> 14 13 #include <linux/platform_device.h> 15 14 #include <linux/slab.h> 16 15
+2 -2
drivers/power/reset/brcm-kona-reset.c
··· 2 2 // Copyright (C) 2016 Broadcom 3 3 4 4 #include <linux/io.h> 5 - #include <linux/of_address.h> 6 - #include <linux/of_platform.h> 5 + #include <linux/mod_devicetable.h> 6 + #include <linux/platform_device.h> 7 7 #include <linux/reboot.h> 8 8 9 9 #define RSTMGR_REG_WR_ACCESS_OFFSET 0
+2 -1
drivers/power/reset/gpio-poweroff.c
··· 11 11 #include <linux/init.h> 12 12 #include <linux/delay.h> 13 13 #include <linux/platform_device.h> 14 + #include <linux/property.h> 14 15 #include <linux/gpio/consumer.h> 15 - #include <linux/of_platform.h> 16 + #include <linux/mod_devicetable.h> 16 17 #include <linux/module.h> 17 18 18 19 #define DEFAULT_TIMEOUT_MS 3000
+1 -1
drivers/power/reset/gpio-restart.c
··· 12 12 #include <linux/delay.h> 13 13 #include <linux/platform_device.h> 14 14 #include <linux/gpio/consumer.h> 15 - #include <linux/of_platform.h> 16 15 #include <linux/module.h> 16 + #include <linux/of.h> 17 17 18 18 struct gpio_restart { 19 19 struct gpio_desc *reset_gpio;
+2 -1
drivers/power/reset/keystone-reset.c
··· 10 10 #include <linux/io.h> 11 11 #include <linux/module.h> 12 12 #include <linux/notifier.h> 13 + #include <linux/platform_device.h> 13 14 #include <linux/reboot.h> 14 15 #include <linux/regmap.h> 15 16 #include <linux/mfd/syscon.h> 16 - #include <linux/of_platform.h> 17 + #include <linux/of.h> 17 18 18 19 #define RSTYPE_RG 0x0 19 20 #define RSCTRL_RG 0x4
+2 -2
drivers/power/reset/ocelot-reset.c
··· 8 8 #include <linux/delay.h> 9 9 #include <linux/io.h> 10 10 #include <linux/notifier.h> 11 + #include <linux/mod_devicetable.h> 11 12 #include <linux/mfd/syscon.h> 12 - #include <linux/of_address.h> 13 - #include <linux/of_device.h> 14 13 #include <linux/platform_device.h> 14 + #include <linux/property.h> 15 15 #include <linux/reboot.h> 16 16 #include <linux/regmap.h> 17 17
+2 -1
drivers/power/reset/odroid-go-ultra-poweroff.c
··· 4 4 */ 5 5 #include <linux/kernel.h> 6 6 #include <linux/init.h> 7 - #include <linux/of_platform.h> 7 + #include <linux/of.h> 8 + #include <linux/platform_device.h> 8 9 #include <linux/mfd/rk808.h> 9 10 #include <linux/regmap.h> 10 11 #include <linux/module.h>
-2
drivers/power/reset/oxnas-restart.c
··· 13 13 #include <linux/io.h> 14 14 #include <linux/notifier.h> 15 15 #include <linux/mfd/syscon.h> 16 - #include <linux/of_address.h> 17 - #include <linux/of_device.h> 18 16 #include <linux/platform_device.h> 19 17 #include <linux/reboot.h> 20 18 #include <linux/regmap.h>
+1 -1
drivers/power/reset/st-poweroff.c
··· 9 9 10 10 #include <linux/module.h> 11 11 #include <linux/of.h> 12 - #include <linux/of_platform.h> 12 + #include <linux/of_device.h> 13 13 #include <linux/platform_device.h> 14 14 #include <linux/mfd/syscon.h> 15 15 #include <linux/reboot.h>
+1 -2
drivers/power/reset/syscon-poweroff.c
··· 10 10 #include <linux/io.h> 11 11 #include <linux/notifier.h> 12 12 #include <linux/mfd/syscon.h> 13 - #include <linux/of_address.h> 14 - #include <linux/of_device.h> 13 + #include <linux/of.h> 15 14 #include <linux/platform_device.h> 16 15 #include <linux/pm.h> 17 16 #include <linux/regmap.h>
+1 -2
drivers/power/reset/syscon-reboot.c
··· 9 9 #include <linux/io.h> 10 10 #include <linux/notifier.h> 11 11 #include <linux/mfd/syscon.h> 12 - #include <linux/of_address.h> 13 - #include <linux/of_device.h> 12 + #include <linux/of.h> 14 13 #include <linux/platform_device.h> 15 14 #include <linux/reboot.h> 16 15 #include <linux/regmap.h>
+1 -1
drivers/power/reset/xgene-reboot.c
··· 13 13 #include <linux/delay.h> 14 14 #include <linux/io.h> 15 15 #include <linux/notifier.h> 16 - #include <linux/of_device.h> 16 + #include <linux/of.h> 17 17 #include <linux/of_address.h> 18 18 #include <linux/platform_device.h> 19 19 #include <linux/reboot.h>
-1
drivers/power/supply/axp20x_ac_power.c
··· 13 13 #include <linux/mfd/axp20x.h> 14 14 #include <linux/module.h> 15 15 #include <linux/of.h> 16 - #include <linux/of_device.h> 17 16 #include <linux/platform_device.h> 18 17 #include <linux/pm.h> 19 18 #include <linux/power_supply.h>
-1
drivers/power/supply/axp20x_battery.c
··· 22 22 #include <linux/irq.h> 23 23 #include <linux/module.h> 24 24 #include <linux/of.h> 25 - #include <linux/of_device.h> 26 25 #include <linux/platform_device.h> 27 26 #include <linux/power_supply.h> 28 27 #include <linux/regmap.h>
-1
drivers/power/supply/axp20x_usb_power.c
··· 15 15 #include <linux/mfd/axp20x.h> 16 16 #include <linux/module.h> 17 17 #include <linux/of.h> 18 - #include <linux/of_device.h> 19 18 #include <linux/platform_device.h> 20 19 #include <linux/pm.h> 21 20 #include <linux/power_supply.h>
+1 -1
drivers/power/supply/cpcap-battery.c
··· 15 15 #include <linux/interrupt.h> 16 16 #include <linux/kernel.h> 17 17 #include <linux/module.h> 18 - #include <linux/of_device.h> 18 + #include <linux/of.h> 19 19 #include <linux/platform_device.h> 20 20 #include <linux/power_supply.h> 21 21 #include <linux/reboot.h>
-2
drivers/power/supply/da9150-charger.c
··· 11 11 #include <linux/slab.h> 12 12 #include <linux/module.h> 13 13 #include <linux/platform_device.h> 14 - #include <linux/of.h> 15 - #include <linux/of_platform.h> 16 14 #include <linux/interrupt.h> 17 15 #include <linux/power_supply.h> 18 16 #include <linux/notifier.h>
-1
drivers/power/supply/da9150-fg.c
··· 11 11 #include <linux/module.h> 12 12 #include <linux/platform_device.h> 13 13 #include <linux/of.h> 14 - #include <linux/of_platform.h> 15 14 #include <linux/slab.h> 16 15 #include <linux/interrupt.h> 17 16 #include <linux/delay.h>
+1 -1
drivers/power/supply/lego_ev3_battery.c
··· 20 20 #include <linux/iio/types.h> 21 21 #include <linux/kernel.h> 22 22 #include <linux/module.h> 23 - #include <linux/of_device.h> 23 + #include <linux/mod_devicetable.h> 24 24 #include <linux/platform_device.h> 25 25 #include <linux/power_supply.h> 26 26
+1 -1
drivers/power/supply/ltc2941-battery-gauge.c
··· 11 11 #include <linux/devm-helpers.h> 12 12 #include <linux/kernel.h> 13 13 #include <linux/module.h> 14 - #include <linux/of_device.h> 14 + #include <linux/of.h> 15 15 #include <linux/types.h> 16 16 #include <linux/errno.h> 17 17 #include <linux/swab.h>
+1 -1
drivers/power/supply/ltc4162-l-charger.c
··· 6 6 7 7 #include <linux/module.h> 8 8 #include <linux/delay.h> 9 - #include <linux/of_device.h> 9 + #include <linux/of.h> 10 10 #include <linux/pm_runtime.h> 11 11 #include <linux/power_supply.h> 12 12 #include <linux/i2c.h>
+1 -1
drivers/power/supply/max14656_charger_detector.c
··· 14 14 #include <linux/delay.h> 15 15 #include <linux/i2c.h> 16 16 #include <linux/interrupt.h> 17 + #include <linux/mod_devicetable.h> 17 18 #include <linux/slab.h> 18 - #include <linux/of_device.h> 19 19 #include <linux/workqueue.h> 20 20 #include <linux/power_supply.h> 21 21 #include <linux/devm-helpers.h>
+1 -1
drivers/power/supply/max17040_battery.c
··· 15 15 #include <linux/delay.h> 16 16 #include <linux/interrupt.h> 17 17 #include <linux/power_supply.h> 18 - #include <linux/of_device.h> 18 + #include <linux/of.h> 19 19 #include <linux/regmap.h> 20 20 #include <linux/slab.h> 21 21
-1
drivers/power/supply/max8903_charger.c
··· 10 10 #include <linux/interrupt.h> 11 11 #include <linux/module.h> 12 12 #include <linux/of.h> 13 - #include <linux/of_device.h> 14 13 #include <linux/slab.h> 15 14 #include <linux/power_supply.h> 16 15 #include <linux/platform_device.h>
-1
drivers/power/supply/rn5t618_power.c
··· 14 14 #include <linux/interrupt.h> 15 15 #include <linux/module.h> 16 16 #include <linux/mfd/rn5t618.h> 17 - #include <linux/of_device.h> 18 17 #include <linux/platform_device.h> 19 18 #include <linux/power_supply.h> 20 19 #include <linux/regmap.h>
+1 -1
drivers/power/supply/rt5033_charger.c
··· 6 6 * Author: Beomho Seo <beomho.seo@samsung.com> 7 7 */ 8 8 9 + #include <linux/mod_devicetable.h> 9 10 #include <linux/module.h> 10 - #include <linux/of_device.h> 11 11 #include <linux/platform_device.h> 12 12 #include <linux/power_supply.h> 13 13 #include <linux/regmap.h>
+1 -2
drivers/power/supply/rt9455_charger.c
··· 8 8 #include <linux/module.h> 9 9 #include <linux/interrupt.h> 10 10 #include <linux/delay.h> 11 - #include <linux/of_irq.h> 12 - #include <linux/of_device.h> 11 + #include <linux/of.h> 13 12 #include <linux/pm_runtime.h> 14 13 #include <linux/power_supply.h> 15 14 #include <linux/i2c.h>
+1 -1
drivers/power/supply/sbs-battery.c
··· 16 16 #include <linux/kernel.h> 17 17 #include <linux/module.h> 18 18 #include <linux/property.h> 19 - #include <linux/of_device.h> 19 + #include <linux/of.h> 20 20 #include <linux/power/sbs-battery.h> 21 21 #include <linux/power_supply.h> 22 22 #include <linux/slab.h>
+1 -1
drivers/power/supply/tps65090-charger.c
··· 13 13 #include <linux/kernel.h> 14 14 #include <linux/kthread.h> 15 15 #include <linux/module.h> 16 - #include <linux/of_device.h> 16 + #include <linux/of.h> 17 17 #include <linux/platform_device.h> 18 18 #include <linux/power_supply.h> 19 19 #include <linux/slab.h>
-1
drivers/power/supply/tps65217_charger.c
··· 17 17 #include <linux/slab.h> 18 18 #include <linux/err.h> 19 19 #include <linux/of.h> 20 - #include <linux/of_device.h> 21 20 #include <linux/power_supply.h> 22 21 23 22 #include <linux/mfd/core.h>
+1
drivers/power/supply/twl4030_charger.c
··· 12 12 #include <linux/module.h> 13 13 #include <linux/slab.h> 14 14 #include <linux/err.h> 15 + #include <linux/of.h> 15 16 #include <linux/platform_device.h> 16 17 #include <linux/interrupt.h> 17 18 #include <linux/mfd/twl.h>