ARM: sa1100: collie-battery.c: include platform_device.h directly
RFC 1/1 ARM: sa1100: collie-battery.c: include platform_device.h directly
Initial try to fix compilation error
linux/include/linux/mfd/mcp.h:22:16: error: field 'attached_device' has incomplete type linux/include/linux/mfd/mcp.h:48:23: error: field 'drv' has incomplete type linux/include/linux/mfd/ucb1x00.h:137:17: error: field 'dev' has incomplete type linux/drivers/power/collie_battery.c:290:56: error: unknown type name 'pm_message_t' linux/drivers/power/collie_battery.c:371:13: error: 'collie_bat_suspend' undeclared here (not in a function) | make[4]: *** [drivers/power/collie_battery.o] Error 1
| make[3]: *** [drivers/power] Error 2
As seen in Arnd Bergmann patches on LAKML
[PATCH 7/9] ARM defconfigs: add missing inclusions of linux/platform_device.h [PATCH 1/9] ARM: sa1100/assabet: include platform_device.h directly
Compilation is still not clean, two warnings:linux/drivers/power/collie_battery.c:372:2: warning: initialization from incompatible pointer type [enabled by default] linux/drivers/power/collie_battery.c:372:2: warning: (near initialization for 'collie_bat_driver.suspend') [enabled by default]
--- drivers/power/collie_battery.c | 1 + drivers/video/logo/logo_linux_clut224.ppm | 232006 ++++++++++++++++++++++++++- 2 files changed, 230404 insertions(+), 1603 deletions(-)
drivers/power/collie_battery.c +1 -0
@@ -14,6 +14,7 @@#include <linux/module.h> #include <linux/power_supply.h> #include <linux/delay.h> +#include <linux/platform_device.h> #include <linux/spinlock.h> #include <linux/interrupt.h> #include <linux/gpio.h>
Signature · 1 line
1.7.12.4
Hi Andrea,
Quoted 1 line · Andrea Adami
Initial try to fix compilation error
Things are a bit more complex...
Quoted 1 line
linux/include/linux/mfd/mcp.h:22:16: error: field 'attached_device' has incomplete type
You have to add #include <linux/device.h> into mfd/mcp.h. This will add struct device and...
Quoted 1 line
linux/include/linux/mfd/mcp.h:48:23: error: field 'drv' has incomplete type
struct device_driver.
Quoted 1 line
linux/include/linux/mfd/ucb1x00.h:137:17: error: field 'dev' has incomplete type
Same here, the file ucb1x00.h needs #include <linux/device.h>.
Quoted 1 line
linux/drivers/power/collie_battery.c:290:56: error: unknown type name 'pm_message_t'
#include <linux/pm.h> into collie_battery.c
Thanks,
Anton
Quoted 23 lines
linux/drivers/power/collie_battery.c:371:13: error: 'collie_bat_suspend' undeclared here (not in a function) | make[4]: *** [drivers/power/collie_battery.o] Error 1
| make[3]: *** [drivers/power] Error 2As seen in Arnd Bergmann patches on LAKML
[PATCH 7/9] ARM defconfigs: add missing inclusions oflinux/platform_device.h[PATCH 1/9] ARM: sa1100/assabet: includeplatform_device.hdirectlyCompilation is still not clean, two warnings:
linux/drivers/power/collie_battery.c:372:2: warning: initialization from incompatible pointer type [enabled by default]linux/drivers/power/collie_battery.c:372:2: warning: (near initialization for 'collie_bat_driver.suspend') [enabled by default]Signed-off-by Andrea Adami <[email protected]>--- drivers/power/collie_battery.c | 1 + drivers/video/logo/logo_linux_clut224.ppm | 232006 ++++++++++++++++++++++++++- 2 files changed, 230404 insertions(+), 1603 deletions(-)drivers/power/collie_battery.c +0
-0
drivers/power/collie_battery.c line 17
Quoted 4 lines
drivers/power/collie_battery.c +1
-0@@ -14,6 +14,7 @@#include <linux/module.h> #include <linux/power_supply.h> #include <linux/delay.h> +#include <linux/platform_device.h>
I don't see anywhere in the driver which would need platform_device.h... But pm.h, yes.
Quoted 5 lines
drivers/power/collie_battery.c +0
-0#include <linux/spinlock.h> #include <linux/interrupt.h> #include <linux/gpio.h> Signature · 1 line
1.7.12.4
Quoted 12 lines · Anton Vorontsov
Hi Andrea,
Quoted 1 line · Andrea Adami
Initial try to fix compilation error
Things are a bit more complex...
Quoted 1 line
linux/include/linux/mfd/mcp.h:22:16: error: field 'attached_device' has incomplete typeYou have to add #include <
linux/device.h> intomfd/mcp.h. This will add struct device and...
Bingo.Adding it solves all following errors, no need for further inclusions.
Quoted 8 lines
Quoted 1 line
linux/include/linux/mfd/mcp.h:48:23: error: field 'drv' has incomplete typestruct
device_driver.Quoted 1 line
linux/include/linux/mfd/ucb1x00.h:137:17: error: field 'dev' has incomplete typeSame here, the file
ucb1x00.hneeds #include <linux/device.h>.
Seems not needed, mcp.h is included by ucb1x00.h
Quoted 4 lines
Quoted 1 line
linux/drivers/power/collie_battery.c:290:56: error: unknown type name 'pm_message_t'#include <
linux/pm.h> intocollie_battery.c
Seems not needed, is included in mcp-sa11x0.c (included by collie_battery.c)
The warning remains, though:
linux/drivers/power/collie_battery.c:372:2: warning: initialization
from incompatible pointer type [enabled by default]
Quoted 4 lines
Thanks,
Anton
Thank you for your attention
Regards
Andrea
Thanks
Quoted 18 lines
Quoted 18 lines
linux/drivers/power/collie_battery.c:371:13: error: 'collie_bat_suspend' undeclared here (not in a function) | make[4]: *** [drivers/power/collie_battery.o] Error 1
| make[3]: *** [drivers/power] Error 2As seen in Arnd Bergmann patches on LAKML
[PATCH 7/9] ARM defconfigs: add missing inclusions oflinux/platform_device.h[PATCH 1/9] ARM: sa1100/assabet: includeplatform_device.hdirectlyCompilation is still not clean, two warnings:
linux/drivers/power/collie_battery.c:372:2: warning: initialization from incompatible pointer type [enabled by default]linux/drivers/power/collie_battery.c:372:2: warning: (near initialization for 'collie_bat_driver.suspend') [enabled by default]Signed-off-by Andrea Adami <[email protected]>--- drivers/power/collie_battery.c | 1 + drivers/video/logo/logo_linux_clut224.ppm | 232006 ++++++++++++++++++++++++++- 2 files changed, 230404 insertions(+), 1603 deletions(-)
Quoted 13 lines
drivers/power/collie_battery.c line 17
Quoted 9 lines
drivers/power/collie_battery.c +1
-0@@ -14,6 +14,7 @@#include <linux/module.h> #include <linux/power_supply.h> #include <linux/delay.h> +#include <linux/platform_device.h> I don't see anywhere in the driver which would need
platform_device.h... Butpm.h, yes.
Sorry, I'm not a kernel developer. It was a desperate try to unbrick build. I'm just maintaining the layer needed to build Zaurus images using Yocto toolchain.
Up to now, I could only build a working linux-as-bootloader kernel (kexecboot) for collie with old 2.6.31+ sources:
userspace is not a problem now but the poor device is suffering some serious bitrot :/
Quoted 5 lines
Quoted 5 lines
drivers/power/collie_battery.c +0
-1#include <linux/spinlock.h> #include <linux/interrupt.h> #include <linux/gpio.h> --1.7.12.4
Quoted 17 lines · Andrea Adami
Quoted 12 lines · Anton Vorontsov
Hi Andrea,
Quoted 1 line · Andrea Adami
Initial try to fix compilation error
Things are a bit more complex...
Quoted 1 line
linux/include/linux/mfd/mcp.h:22:16: error: field 'attached_device' has incomplete typeYou have to add #include <
linux/device.h> intomfd/mcp.h. This will add struct device and...Bingo.Adding it solves all following errors, no need for further inclusions.
Quoted 2 lines
Quoted 1 line
linux/include/linux/mfd/mcp.h:48:23: error: field 'drv' has incomplete type
Quoted 7 lines
Quoted 6 lines
struct
device_driver.Quoted 1 line
linux/include/linux/mfd/ucb1x00.h:137:17: error: field 'dev' has incomplete typeSame here, the file
ucb1x00.hneeds #include <linux/device.h>.Seems not needed,
mcp.his included byucb1x00.h
Generally, we don't depend on indirect inclusions. But if it doesn't harm anyhow so far, we may not bother with this.
Thanks,
Anton