aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@sw.ru>2007-10-17 02:26:04 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:42:46 -0400
commitf6b450d489f2fb4e909447beacad64edb8aa0cda (patch)
tree85240acdf3d5c1cb2f193a72c99e24789acc0a0e
parente4dc1b14d8dc57c3975bf69740e4f5cda6bfba09 (diff)
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>
-rw-r--r--arch/ia64/ia32/binfmt_elf32.c2
-rw-r--r--fs/exec.c3
-rw-r--r--include/linux/binfmts.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
index 1cfab326fb7e..f6ae3ec93810 100644
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -240,7 +240,7 @@ static int __init check_elf32_binfmt(void)
240{ 240{
241 if (cpu_uses_ia32el()) { 241 if (cpu_uses_ia32el()) {
242 printk("Please use IA-32 EL for executing IA-32 binaries\n"); 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 return 0; 245 return 0;
246} 246}
diff --git a/fs/exec.c b/fs/exec.c
index 65825bdc4475..550ae9b22f8d 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -81,12 +81,11 @@ int register_binfmt(struct linux_binfmt * fmt)
81 81
82EXPORT_SYMBOL(register_binfmt); 82EXPORT_SYMBOL(register_binfmt);
83 83
84int unregister_binfmt(struct linux_binfmt * fmt) 84void unregister_binfmt(struct linux_binfmt * fmt)
85{ 85{
86 write_lock(&binfmt_lock); 86 write_lock(&binfmt_lock);
87 list_del(&fmt->lh); 87 list_del(&fmt->lh);
88 write_unlock(&binfmt_lock); 88 write_unlock(&binfmt_lock);
89 return 0;
90} 89}
91 90
92EXPORT_SYMBOL(unregister_binfmt); 91EXPORT_SYMBOL(unregister_binfmt);
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 6b834dcd20b0..63d54366e0e5 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -73,7 +73,7 @@ struct linux_binfmt {
73}; 73};
74 74
75extern int register_binfmt(struct linux_binfmt *); 75extern int register_binfmt(struct linux_binfmt *);
76extern int unregister_binfmt(struct linux_binfmt *); 76extern void unregister_binfmt(struct linux_binfmt *);
77 77
78extern int prepare_binprm(struct linux_binprm *); 78extern int prepare_binprm(struct linux_binprm *);
79extern int __must_check remove_arg_zero(struct linux_binprm *); 79extern int __must_check remove_arg_zero(struct linux_binprm *);