Commit e47d860c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] genrtc: cleanups

From: "Randy.Dunlap" <rddunlap@osdl.org>

From: Luiz Fernando Capitulino <lcapitulino@prefeitura.sp.gov.br>

remove ifdef/endif in rtc_generic_init().
use returned error code;
parent a1d75429
...@@ -466,6 +466,17 @@ static int gen_rtc_read_proc(char *page, char **start, off_t off, ...@@ -466,6 +466,17 @@ static int gen_rtc_read_proc(char *page, char **start, off_t off,
return len; return len;
} }
static int __init gen_rtc_proc_init(void)
{
struct proc_dir_entry *r;
r = create_proc_read_entry("driver/rtc", 0, 0, gen_rtc_read_proc, NULL);
if (!r)
return -ENOMEM;
return 0;
}
#else
static inline int gen_rtc_proc_init(void) { return 0; }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
...@@ -498,15 +509,14 @@ static int __init rtc_generic_init(void) ...@@ -498,15 +509,14 @@ static int __init rtc_generic_init(void)
printk(KERN_INFO "Generic RTC Driver v%s\n", RTC_VERSION); printk(KERN_INFO "Generic RTC Driver v%s\n", RTC_VERSION);
retval = misc_register(&rtc_gen_dev); retval = misc_register(&rtc_gen_dev);
if(retval < 0) if (retval < 0)
return retval; return retval;
#ifdef CONFIG_PROC_FS retval = gen_rtc_proc_init();
if((create_proc_read_entry ("driver/rtc", 0, 0, gen_rtc_read_proc, NULL)) == NULL){ if (retval) {
misc_deregister(&rtc_gen_dev); misc_deregister(&rtc_gen_dev);
return -ENOMEM; return retval;
} }
#endif
return 0; return 0;
} }
......
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