From f6b450d489f2fb4e909447beacad64edb8aa0cda Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Tue, 16 Oct 2007 23:26:04 -0700 Subject: [PATCH] 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/ia64/ia32/binfmt_elf32.c | 2 +- fs/exec.c | 3 +-- include/linux/binfmts.h | 2 +- 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) { if (cpu_uses_ia32el()) { printk("Please use IA-32 EL for executing IA-32 binaries\n"); - return unregister_binfmt(&elf_format); + unregister_binfmt(&elf_format); } return 0; } 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) EXPORT_SYMBOL(register_binfmt); -int unregister_binfmt(struct linux_binfmt * fmt) +void unregister_binfmt(struct linux_binfmt * fmt) { write_lock(&binfmt_lock); list_del(&fmt->lh); write_unlock(&binfmt_lock); - return 0; } EXPORT_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 { }; extern int register_binfmt(struct linux_binfmt *); -extern int unregister_binfmt(struct linux_binfmt *); +extern void unregister_binfmt(struct linux_binfmt *); extern int prepare_binprm(struct linux_binprm *); extern int __must_check remove_arg_zero(struct linux_binprm *);