Commit f6b450d489f2fb4e909447beacad64edb8aa0cda

Authored by Alexey Dobriyan
Committed by Linus Torvalds
1 parent e4dc1b14d8

Make unregister_binfmt() return void

list_del() hardly can fail, so checking for return value is pointless
(and current code always return 0).

Nobody really cared that return value anyway.

Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 3 changed files with 3 additions and 4 deletions Side-by-side Diff

arch/ia64/ia32/binfmt_elf32.c
... ... @@ -240,7 +240,7 @@
240 240 {
241 241 if (cpu_uses_ia32el()) {
242 242 printk("Please use IA-32 EL for executing IA-32 binaries\n");
243   - return unregister_binfmt(&elf_format);
  243 + unregister_binfmt(&elf_format);
244 244 }
245 245 return 0;
246 246 }
... ... @@ -81,12 +81,11 @@
81 81  
82 82 EXPORT_SYMBOL(register_binfmt);
83 83  
84   -int unregister_binfmt(struct linux_binfmt * fmt)
  84 +void unregister_binfmt(struct linux_binfmt * fmt)
85 85 {
86 86 write_lock(&binfmt_lock);
87 87 list_del(&fmt->lh);
88 88 write_unlock(&binfmt_lock);
89   - return 0;
90 89 }
91 90  
92 91 EXPORT_SYMBOL(unregister_binfmt);
include/linux/binfmts.h
... ... @@ -73,7 +73,7 @@
73 73 };
74 74  
75 75 extern int register_binfmt(struct linux_binfmt *);
76   -extern int unregister_binfmt(struct linux_binfmt *);
  76 +extern void unregister_binfmt(struct linux_binfmt *);
77 77  
78 78 extern int prepare_binprm(struct linux_binprm *);
79 79 extern int __must_check remove_arg_zero(struct linux_binprm *);