m68k: amiga: remove redundant amiga_reset prototype
PATCH v3 1/1 m68k: amiga: remove redundant amiga_reset prototype
Remove the redundant amiga_reset() prototype and mark the first one as __noreturn instead.
Tested-by Daniel Palmer <[email protected]>
Signed-off-by Thorsten Blum <[email protected]>
---
Changes in v3:
- Fix patch description and drop __noreturn from the definition (Geert)
- v2: https://lore.kernel.org/r/[email protected]/
Changes in v2:
- Specify the __noreturn attribute before the function name to avoid a compile-time error (Daniel)
- v1: https://lore.kernel.org/r/[email protected]/
--- arch/m68k/amiga/config.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/m68k/amiga/config.c +1 -3
@@ -96,7 +96,7 @@ static char amiga_model_name[13] = "Amiga ";static void amiga_sched_init (void );static void amiga_get_model (char *model);static void amiga_get_hardware_list (struct seq_file *m); -static void amiga_reset (void ); +static void amiga_reset (void )__noreturn ;static void amiga_mem_console_write (struct console *co,const char *b,unsigned int count);#ifdef CONFIG_HEARTBEAT
@@ -543,8 +543,6 @@ static u64 amiga_read_clk(struct clocksource *cs)return ticks; } -static void amiga_reset (void )__noreturn ; -static void amiga_reset (void ) {unsigned long jmp_addr040 =virt_to_phys (&&jmp_addr_label040);
Quoted 8 lines · Thorsten Blum
Remove the redundant
amiga_reset()prototype and mark the first one as__noreturninstead.Tested-by Daniel Palmer <[email protected]>Signed-off-by Thorsten Blum <[email protected]>---
Changes in v3:
- Fix patch description and drop__noreturnfrom the definition (Geert)
Reviewed-by Geert Uytterhoeven <[email protected]>
i.e. will queue in the m68k tree for v7.3.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds