[PATCH] remove pointer/integer confusion in generic_calibrate_decr

STALE7522d

2 messages, 1 author, 2006-02-04 · open the first message on its own page

[PATCH] remove pointer/integer confusion in generic_calibrate_decr

From: Olaf Hering <hidden>
Date: 2006-02-04 09:35:02

remove pointer/integer confusion

Signed-off-by: Olaf Hering <redacted>

 arch/powerpc/kernel/time.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Index: linux-2.6.16-rc2-olh/arch/powerpc/kernel/time.c
===================================================================

--- linux-2.6.16-rc2-olh.orig/arch/powerpc/kernel/time.c
+++ linux-2.6.16-rc2-olh/arch/powerpc/kernel/time.c

@@ -612,10 +612,10 @@ void __init generic_calibrate_decr(void)
 
 	ppc_tb_freq = DEFAULT_TB_FREQ;		/* hardcoded default */
 	node_found = 0;
-	if (cpu != 0) {
+	if (cpu) {
 		fp = (unsigned int *)get_property(cpu, "timebase-frequency",
 						  NULL);
-		if (fp != 0) {
+		if (fp) {
 			node_found = 1;
 			ppc_tb_freq = *fp;
 		}

@@ -626,10 +626,10 @@ void __init generic_calibrate_decr(void)
 
 	ppc_proc_freq = DEFAULT_PROC_FREQ;
 	node_found = 0;
-	if (cpu != 0) {
+	if (cpu) {
 		fp = (unsigned int *)get_property(cpu, "clock-frequency",
 						  NULL);
-		if (fp != 0) {
+		if (fp) {
 			node_found = 1;
 			ppc_proc_freq = *fp;
 		}

-- 
short story of a lazy sysadmin:
 alias appserv=wotan

[PATCH] remove pointer/integer confusion in of_find_node_by_name

From: Olaf Hering <hidden>
Date: 2006-02-04 11:45:01

remove pointer/integer confusion

Signed-off-by: Olaf Hering <redacted>

 arch/powerpc/kernel/prom.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.16-rc2-olh/arch/powerpc/kernel/prom.c
===================================================================

--- linux-2.6.16-rc2-olh.orig/arch/powerpc/kernel/prom.c
+++ linux-2.6.16-rc2-olh/arch/powerpc/kernel/prom.c

@@ -1398,8 +1398,8 @@ struct device_node *of_find_node_by_name
 
 	read_lock(&devtree_lock);
 	np = from ? from->allnext : allnodes;
-	for (; np != 0; np = np->allnext)
-		if (np->name != 0 && strcasecmp(np->name, name) == 0
+	for (; np != NULL; np = np->allnext)
+		if (np->name != NULL && strcasecmp(np->name, name) == 0
 		    && of_node_get(np))
 			break;
 	if (from)

-- 
short story of a lazy sysadmin:
 alias appserv=wotan

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help