Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49c28e4e authored Apr 02, 2006 by Anton Blanchard Committed by Paul Mackerras Apr 13, 2006

[PATCH] powerpc: Avoid __initcall warnings



Fix __initcall return in proc_rtas_init and rtas_init.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

parent ddafddcf

arch/powerpc/kernel/rtas-proc.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -258,11 +258,11 @@ static int __init proc_rtas_init(void)
	struct proc_dir_entry *entry;		struct proc_dir_entry *entry;

	if (!machine_is(pseries))		if (!machine_is(pseries))
	return 1;		return -ENODEV;

	rtas_node = of_find_node_by_name(NULL, "rtas");		rtas_node = of_find_node_by_name(NULL, "rtas");
	if (rtas_node == NULL)		if (rtas_node == NULL)
	return 1;		return -ENODEV;

	entry = create_proc_entry("ppc64/rtas/progress", S_IRUGO\|S_IWUSR, NULL);		entry = create_proc_entry("ppc64/rtas/progress", S_IRUGO\|S_IWUSR, NULL);
	if (entry)		if (entry)

arch/powerpc/platforms/pseries/rtasd.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -488,7 +488,7 @@ static int __init rtas_init(void)
	/* No RTAS */		/* No RTAS */
	if (rtas_token("event-scan") == RTAS_UNKNOWN_SERVICE) {		if (rtas_token("event-scan") == RTAS_UNKNOWN_SERVICE) {
	printk(KERN_INFO "rtasd: no event-scan on system\n");		printk(KERN_INFO "rtasd: no event-scan on system\n");
	return 1;		return -ENODEV;
	}		}

	entry = create_proc_entry("ppc64/rtas/error_log", S_IRUSR, NULL);		entry = create_proc_entry("ppc64/rtas/error_log", S_IRUSR, NULL);