Messages in this thread Patch in this message | | | Subject | [PATCH 2/5] Fix a warning in input.c when CONFIG_PROC_FS is not set | Date | Fri, 19 Sep 2003 21:47:15 +0200 | From | Vojtech Pavlik <> |
| |
You can pull this changeset from: bk://kernel.bkbits.net/vojtech/input
===================================================================
ChangeSet@1.1351, 2003-09-19 13:23:54+02:00, lcapitulino@prefeitura.sp.gov.br input: Fix a warning in input.c when CONFIG_PROC_FS is not set.
input.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-)
===================================================================
diff -Nru a/drivers/input/input.c b/drivers/input/input.c --- a/drivers/input/input.c Fri Sep 19 14:12:57 2003 +++ b/drivers/input/input.c Fri Sep 19 14:12:57 2003 @@ -678,20 +678,10 @@ return (count > cnt) ? cnt : count; } -#endif - -struct class input_class = { - .name = "input", -}; - -static int __init input_init(void) +static int __init input_proc_init(void) { struct proc_dir_entry *entry; - int retval = -ENOMEM; - - class_register(&input_class); -#ifdef CONFIG_PROC_FS proc_bus_input_dir = proc_mkdir("input", proc_bus); if (proc_bus_input_dir == NULL) return -ENOMEM; @@ -710,7 +700,22 @@ return -ENOMEM; } entry->owner = THIS_MODULE; + return 0; +} +#else /* !CONFIG_PROC_FS */ +static inline int input_proc_init(void) { return 0; } #endif + +struct class input_class = { + .name = "input", +}; + +static int __init input_init(void) +{ + int retval = -ENOMEM; + + class_register(&input_class); + input_proc_init(); retval = register_chrdev(INPUT_MAJOR, "input", &input_fops); if (retval) { printk(KERN_ERR "input: unable to register char major %d", INPUT_MAJOR); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |