Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9402c95f34a66e81eba473a2f7267bbae5a1dee2

Authored by Joe Perches
Committed by Linus Torvalds
1 parent 80bf007f20
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

treewide: remove useless NORET_TYPE macro and uses 

It's a very old and now unused prototype marking so just delete it.

Neaten panic pointer argument style to keep checkpatch quiet.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 15 changed files with 21 additions and 22 deletions Side-by-side Diff

arch/avr32/include/asm/system.h
Diff comments   View file @ 9402c95
... ... @@ -169,7 +169,7 @@
169 169 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
170 170  
171 171 struct pt_regs;
172   -void NORET_TYPE die(const char *str, struct pt_regs *regs, long err);
  172 +void die(const char *str, struct pt_regs *regs, long err);
173 173 void _exception(long signr, struct pt_regs *regs, int code,
174 174 unsigned long addr);
175 175  
arch/avr32/kernel/traps.c
Diff comments   View file @ 9402c95
... ... @@ -24,7 +24,7 @@
24 24  
25 25 static DEFINE_SPINLOCK(die_lock);
26 26  
27   -void NORET_TYPE die(const char *str, struct pt_regs *regs, long err)
  27 +void die(const char *str, struct pt_regs *regs, long err)
28 28 {
29 29 static int die_counter;
30 30  
arch/ia64/kernel/machine_kexec.c
Diff comments   View file @ 9402c95
... ... @@ -27,7 +27,7 @@
27 27 #include <asm/sal.h>
28 28 #include <asm/mca.h>
29 29  
30   -typedef NORET_TYPE void (*relocate_new_kernel_t)(
  30 +typedef void (*relocate_new_kernel_t)(
31 31 unsigned long indirection_page,
32 32 unsigned long start_address,
33 33 struct ia64_boot_param *boot_param,
arch/m68k/amiga/config.c
Diff comments   View file @ 9402c95
... ... @@ -511,7 +511,7 @@
511 511 return ticks + offset;
512 512 }
513 513  
514   -static NORET_TYPE void amiga_reset(void)
  514 +static void amiga_reset(void)
515 515 ATTRIB_NORET;
516 516  
517 517 static void amiga_reset(void)
arch/mips/include/asm/ptrace.h
Diff comments   View file @ 9402c95
... ... @@ -144,7 +144,7 @@
144 144 extern asmlinkage void syscall_trace_enter(struct pt_regs *regs);
145 145 extern asmlinkage void syscall_trace_leave(struct pt_regs *regs);
146 146  
147   -extern NORET_TYPE void die(const char *, struct pt_regs *) ATTRIB_NORET;
  147 +extern void die(const char *, struct pt_regs *) ATTRIB_NORET;
148 148  
149 149 static inline void die_if_kernel(const char *str, struct pt_regs *regs)
150 150 {
arch/mips/kernel/traps.c
Diff comments   View file @ 9402c95
... ... @@ -1340,7 +1340,7 @@
1340 1340 /*
1341 1341 * NMI exception handler.
1342 1342 */
1343   -NORET_TYPE void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)
  1343 +void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)
1344 1344 {
1345 1345 bust_spinlocks(1);
1346 1346 printk("NMI taken!!!!\n");
arch/powerpc/kernel/machine_kexec_32.c
Diff comments   View file @ 9402c95
... ... @@ -16,7 +16,7 @@
16 16 #include <asm/hw_irq.h>
17 17 #include <asm/io.h>
18 18  
19   -typedef NORET_TYPE void (*relocate_new_kernel_t)(
  19 +typedef void (*relocate_new_kernel_t)(
20 20 unsigned long indirection_page,
21 21 unsigned long reboot_code_buffer,
22 22 unsigned long start_address) ATTRIB_NORET;
arch/powerpc/kernel/machine_kexec_64.c
Diff comments   View file @ 9402c95
... ... @@ -307,9 +307,9 @@
307 307 struct paca_struct kexec_paca;
308 308  
309 309 /* Our assembly helper, in kexec_stub.S */
310   -extern NORET_TYPE void kexec_sequence(void *newstack, unsigned long start,
311   - void *image, void *control,
312   - void (*clear_all)(void)) ATTRIB_NORET;
  310 +extern void kexec_sequence(void *newstack, unsigned long start,
  311 + void *image, void *control,
  312 + void (*clear_all)(void)) ATTRIB_NORET;
313 313  
314 314 /* too late to fail here */
315 315 void default_machine_kexec(struct kimage *image)
arch/s390/kernel/nmi.c
Diff comments   View file @ 9402c95
... ... @@ -30,7 +30,7 @@
30 30  
31 31 static DEFINE_PER_CPU(struct mcck_struct, cpu_mcck);
32 32  
33   -static NORET_TYPE void s390_handle_damage(char *msg)
  33 +static void s390_handle_damage(char *msg)
34 34 {
35 35 smp_send_stop();
36 36 disabled_wait((unsigned long) __builtin_return_address(0));
arch/tile/kernel/machine_kexec.c
Diff comments   View file @ 9402c95
... ... @@ -248,10 +248,10 @@
248 248 }
249 249  
250 250  
251   -NORET_TYPE void machine_kexec(struct kimage *image)
  251 +void machine_kexec(struct kimage *image)
252 252 {
253 253 void *reboot_code_buffer;
254   - NORET_TYPE void (*rnk)(unsigned long, void *, unsigned long)
  254 + void (*rnk)(unsigned long, void *, unsigned long)
255 255 ATTRIB_NORET;
256 256  
257 257 /* Mask all interrupts before starting to reboot. */
include/linux/kernel.h
Diff comments   View file @ 9402c95
... ... @@ -185,16 +185,16 @@
185 185  
186 186 extern struct atomic_notifier_head panic_notifier_list;
187 187 extern long (*panic_blink)(int state);
188   -NORET_TYPE __printf(1, 2)
  188 +__printf(1, 2)
189 189 void panic(const char *fmt, ...)
190 190 ATTRIB_NORET __cold;
191 191 extern void oops_enter(void);
192 192 extern void oops_exit(void);
193 193 void print_oops_end_marker(void);
194 194 extern int oops_may_print(void);
195   -NORET_TYPE void do_exit(long error_code)
  195 +void do_exit(long error_code)
196 196 ATTRIB_NORET;
197   -NORET_TYPE void complete_and_exit(struct completion *, long)
  197 +void complete_and_exit(struct completion *, long)
198 198 ATTRIB_NORET;
199 199  
200 200 /* Internal, do not use. */
include/linux/linkage.h
Diff comments   View file @ 9402c95
... ... @@ -88,7 +88,6 @@
88 88  
89 89 #endif
90 90  
91   -#define NORET_TYPE /**/
92 91 #define ATTRIB_NORET __attribute__((noreturn))
93 92  
94 93 #endif
include/linux/sched.h
Diff comments   View file @ 9402c95
... ... @@ -2275,7 +2275,7 @@
2275 2275 extern void exit_itimers(struct signal_struct *);
2276 2276 extern void flush_itimer_signals(void);
2277 2277  
2278   -extern NORET_TYPE void do_group_exit(int);
  2278 +extern void do_group_exit(int);
2279 2279  
2280 2280 extern void daemonize(const char *, ...);
2281 2281 extern int allow_signal(int);
... ... @@ -887,7 +887,7 @@
887 887 static inline void check_stack_usage(void) {}
888 888 #endif
889 889  
890   -NORET_TYPE void do_exit(long code)
  890 +void do_exit(long code)
891 891 {
892 892 struct task_struct *tsk = current;
893 893 int group_dead;
... ... @@ -1051,7 +1051,7 @@
1051 1051  
1052 1052 EXPORT_SYMBOL_GPL(do_exit);
1053 1053  
1054   -NORET_TYPE void complete_and_exit(struct completion *comp, long code)
  1054 +void complete_and_exit(struct completion *comp, long code)
1055 1055 {
1056 1056 if (comp)
1057 1057 complete(comp);
... ... @@ -1070,7 +1070,7 @@
1070 1070 * Take down every thread in the group. This is called by fatal signals
1071 1071 * as well as by sys_exit_group (below).
1072 1072 */
1073   -NORET_TYPE void
  1073 +void
1074 1074 do_group_exit(int exit_code)
1075 1075 {
1076 1076 struct signal_struct *sig = current->signal;
... ... @@ -57,7 +57,7 @@
57 57 *
58 58 * This function never returns.
59 59 */
60   -NORET_TYPE void panic(const char * fmt, ...)
  60 +void panic(const char *fmt, ...)
61 61 {
62 62 static char buf[1024];
63 63 va_list args;