Commit 026c286c authored by Luiz Capitulino's avatar Luiz Capitulino Committed by Vojtech Pavlik

input: Fix a warning in input.c when CONFIG_PROC_FS is not set.

parent a8aa6602
......@@ -678,20 +678,10 @@ static int input_handlers_read(char *buf, char **start, off_t pos, int count, in
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 @@ static int __init input_init(void)
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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment