__init belongs after the return type on functions, not before it.
Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- drivers/acpi/dock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 8265607..c90112c 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -1055,7 +1055,7 @@ err_unregister: * * This is called by acpi_walk_namespace to look for dock stations and bays. */ -static __init acpi_status +static acpi_status __init find_dock_and_bay(acpi_handle handle, u32 lvl, void *context, void **rv) { if (is_dock(handle) || is_ejectable_bay(handle))
__init belongs after the return type on functions, not before it.
Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- drivers/acpi/numa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 33e609f..2e82e5d 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -159,7 +159,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header) * distance than the others. * Do some quick checks here and only use the SLIT if it passes. */ -static __init int slit_valid(struct acpi_table_slit *slit) +static int __init slit_valid(struct acpi_table_slit *slit) { int i, j; int d = slit->locality_count;
__initdata should come after the variable name being declared and nowhere else, in this way the variable will be placed in the intended section.
Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- drivers/acpi/osl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 6ab2c35..5c81f20 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -1351,8 +1351,8 @@ struct osi_setup_entry { bool enable; };
-static struct osi_setup_entry __initdata - osi_setup_entries[OSI_STRING_ENTRIES_MAX] = { +static struct osi_setup_entry + osi_setup_entries[OSI_STRING_ENTRIES_MAX] __initdata = { {"Module Device", true}, {"Processor Device", true}, {"3.0 _SCP Extensions", true},
On Tuesday, August 13, 2013 06:31:13 PM Hanjun Guo wrote:
__init belongs after the return type on functions, not before it.
Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
All 3 patches in this series queued up for 3.12.
Thanks, Rafael
drivers/acpi/dock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 8265607..c90112c 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -1055,7 +1055,7 @@ err_unregister:
- This is called by acpi_walk_namespace to look for dock stations and bays.
*/ -static __init acpi_status +static acpi_status __init find_dock_and_bay(acpi_handle handle, u32 lvl, void *context, void **rv) { if (is_dock(handle) || is_ejectable_bay(handle))
-
Hanjun Guo -
Rafael J. Wysocki