powerpc/wii: Fix declaration made after definition
PATCH 1/1 powerpc/wii: Fix declaration made after definition
A 0day randconfig uncovered an error with clang, trimmed for brevity:
arch/powerpc/platforms/embedded6xx/wii.c:195:7: error: attribute declaration must precede definition [-Werror,-Wignored-attributes]
if (!machine_is(wii))
^The macro machine_is declares mach_##name but define_machine actually defines mach_##name, hence the warning.
To fix this, move define_machine after the is_machine usage.
--- arch/powerpc/platforms/embedded6xx/wii.c | 25 ++++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-)
arch/powerpc/platforms/embedded6xx/wii.c +12 -13
@@ -172,19 +172,6 @@ static void wii_shutdown(void)flipper_quiesce (); } -define_machine (wii) { - .name = "wii", - .probe = wii_probe, - .setup_arch = wii_setup_arch, - .restart = wii_restart, - .halt = wii_halt, - .init_IRQ = wii_pic_probe, - .get_irq = flipper_pic_get_irq, - .calibrate_decr = generic_calibrate_decr, - .progress = udbg_progress, - .machine_shutdown = wii_shutdown, -}; -static const struct of_device_id wii_of_bus[] = { { .compatible ="nintendo,hollywood" , }, { },
@@ -200,3 +187,15 @@ static int __init wii_device_probe(void) }device_initcall (wii_device_probe); +define_machine (wii) { + .name = "wii", + .probe = wii_probe, + .setup_arch = wii_setup_arch, + .restart = wii_restart, + .halt = wii_halt, + .init_IRQ = wii_pic_probe, + .get_irq = flipper_pic_get_irq, + .calibrate_decr = generic_calibrate_decr, + .progress = udbg_progress, + .machine_shutdown = wii_shutdown, +};
base-commit: 8f3d9f354286745c751374f5f1fcafee6b3f3136
Signature · 1 line
2.26.0
Quoted 61 lines · Nathan Chancellor
A 0day randconfig uncovered an error with clang, trimmed for brevity:
arch/powerpc/platforms/embedded6xx/wii.c:195:7: error: attribute declaration must precede definition [-Werror,-Wignored-attributes]if (!machine_is(wii)) ^The macro
machine_isdeclares mach_##name butdefine_machineactually defines mach_##name, hence the warning.To fix this, move
define_machineafter theis_machineusage.Fixes 5a7ee3198dfa ("powerpc: wii: platform support")Reported-by kbuild test robot <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- arch/powerpc/platforms/embedded6xx/wii.c | 25 ++++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-)arch/powerpc/platforms/embedded6xx/wii.c +12
-13@@ -172,19 +172,6 @@ static void wii_shutdown(void)flipper_quiesce (); } -define_machine (wii) { - .name = "wii", - .probe = wii_probe, - .setup_arch = wii_setup_arch, - .restart = wii_restart, - .halt = wii_halt, - .init_IRQ = wii_pic_probe, - .get_irq = flipper_pic_get_irq, - .calibrate_decr = generic_calibrate_decr, - .progress = udbg_progress, - .machine_shutdown = wii_shutdown, -}; -static const struct of_device_id wii_of_bus[] = { { .compatible ="nintendo,hollywood" , }, { },@@ -200,3 +187,15 @@ static int __init wii_device_probe(void) }device_initcall (wii_device_probe); +define_machine (wii) { + .name = "wii", + .probe = wii_probe, + .setup_arch = wii_setup_arch, + .restart = wii_restart, + .halt = wii_halt, + .init_IRQ = wii_pic_probe, + .get_irq = flipper_pic_get_irq, + .calibrate_decr = generic_calibrate_decr, + .progress = udbg_progress, + .machine_shutdown = wii_shutdown, +};
Quoted 4 lines
base-commit:
8f3d9f354286745c751374f5f1fcafee6b3f3136Signature · 1 line
2.26.0
Gentle ping for review/acceptance.
Cheers,
Nathan
Quoted 5 lines · Nathan Chancellor
A 0day randconfig uncovered an error with clang, trimmed for brevity:
arch/powerpc/platforms/embedded6xx/wii.c:195:7: error: attribute declaration must precede definition [-Werror,-Wignored-attributes]
Quoted 7 lines
if (!machine_is(wii)) ^The macro
machine_isdeclares mach_##name butdefine_machineactually defines mach_##name, hence the warning.To fix this, move
define_machineafter theis_machineusage.
s/is_machine/machine_is/
With that fixup, you may add my reviewed by tag.
Quoted 7 lines
Fixes 5a7ee3198dfa ("powerpc: wii: platform support")Reported-by kbuild test robot <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- arch/powerpc/platforms/embedded6xx/wii.c | 25 ++++++++++++------------
^ I can run Linux on my Wii...think of the possibilities!
Quoted 45 lines
1 file changed, 12 insertions(+), 13 deletions(-)arch/powerpc/platforms/embedded6xx/wii.c +12
-13@@ -172,19 +172,6 @@ static void wii_shutdown(void)flipper_quiesce (); } -define_machine (wii) { - .name = "wii", - .probe = wii_probe, - .setup_arch = wii_setup_arch, - .restart = wii_restart, - .halt = wii_halt, - .init_IRQ = wii_pic_probe, - .get_irq = flipper_pic_get_irq, - .calibrate_decr = generic_calibrate_decr, - .progress = udbg_progress, - .machine_shutdown = wii_shutdown, -}; -static const struct of_device_id wii_of_bus[] = { { .compatible ="nintendo,hollywood" , }, { },@@ -200,3 +187,15 @@ static int __init wii_device_probe(void) }device_initcall (wii_device_probe); +define_machine (wii) { + .name = "wii", + .probe = wii_probe, + .setup_arch = wii_setup_arch, + .restart = wii_restart, + .halt = wii_halt, + .init_IRQ = wii_pic_probe, + .get_irq = flipper_pic_get_irq, + .calibrate_decr = generic_calibrate_decr, + .progress = udbg_progress, + .machine_shutdown = wii_shutdown, +};base-commit:
8f3d9f354286745c751374f5f1fcafee6b3f3136--
Signature · 2 lines
Thanks, ~Nick Desaulniers
PATCH v2 1/1 powerpc/wii: Fix declaration made after definition
In reply to Nathan ChancellorA 0day randconfig uncovered an error with clang, trimmed for brevity:
arch/powerpc/platforms/embedded6xx/wii.c:195:7: error: attribute declaration must precede definition [-Werror,-Wignored-attributes]
if (!machine_is(wii))
^The macro machine_is declares mach_##name but define_machine actually defines mach_##name, hence the warning.
To fix this, move define_machine after the machine_is usage.
---
v1 -> v2:
* s/is_machine/machine_is/ (Nick)
* Add Nick's reviewed-by tag.
arch/powerpc/platforms/embedded6xx/wii.c | 25 ++++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-)
arch/powerpc/platforms/embedded6xx/wii.c +12 -13
@@ -172,19 +172,6 @@ static void wii_shutdown(void)flipper_quiesce (); } -define_machine (wii) { - .name = "wii", - .probe = wii_probe, - .setup_arch = wii_setup_arch, - .restart = wii_restart, - .halt = wii_halt, - .init_IRQ = wii_pic_probe, - .get_irq = flipper_pic_get_irq, - .calibrate_decr = generic_calibrate_decr, - .progress = udbg_progress, - .machine_shutdown = wii_shutdown, -}; -static const struct of_device_id wii_of_bus[] = { { .compatible ="nintendo,hollywood" , }, { },
@@ -200,3 +187,15 @@ static int __init wii_device_probe(void) }device_initcall (wii_device_probe); +define_machine (wii) { + .name = "wii", + .probe = wii_probe, + .setup_arch = wii_setup_arch, + .restart = wii_restart, + .halt = wii_halt, + .init_IRQ = wii_pic_probe, + .get_irq = flipper_pic_get_irq, + .calibrate_decr = generic_calibrate_decr, + .progress = udbg_progress, + .machine_shutdown = wii_shutdown, +};
base-commit: b0523c7b1c9d0edcd6c0fe6d2cb558a9ad5c60a8
Signature · 1 line
2.27.0.rc0
Michael Ellerman
reviewerQuoted 17 lines · Nathan Chancellor
A 0day randconfig uncovered an error with clang, trimmed for brevity:
arch/powerpc/platforms/embedded6xx/wii.c:195:7: error: attribute declaration must precede definition [-Werror,-Wignored-attributes]if (!machine_is(wii)) ^The macro
machine_isdeclares mach_##name butdefine_machineactually defines mach_##name, hence the warning.To fix this, move
define_machineafter themachine_isusage.Fixes 5a7ee3198dfa ("powerpc: wii: platform support")Reported-by kbuild test robot <[email protected]>Reviewed-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>
Quoted 7 lines
---
v1 -> v2:
* s/is_machine/machine_is/ (Nick)
* Add Nick's reviewed-by tag.
I already picked up v1, and it's behind a merge so I don't want to rebase it. I'll live with the typo. Thanks.
cheers
Michael Ellerman
AppliedQuoted 8 lines · Nathan Chancellor
A 0day randconfig uncovered an error with clang, trimmed for brevity:
arch/powerpc/platforms/embedded6xx/wii.c:195:7: error: attribute declaration must precede definition [-Werror,-Wignored-attributes]if (!machine_is(wii)) ^[...]
Applied to powerpc/next.
[1/1] powerpc/wii: Fix declaration made after definition
https://git.kernel.org/powerpc/c/91ffeaa7e5dd62753e23a1204dc7ecd11f26eadc
cheers