[PATCH] ppc: cpm2_pic of_node_get cleanup

Mariusz Kozlowski m.kozlowski at tuxland.pl
Tue Jan 9 21:24:03 EST 2007


Hello, 

> Mariusz Kozlowski writes:
> 
> > 	This patch removes redundant argument check for of_node_get().
> > 
> > Signed-off-by: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
> > 
> >  arch/powerpc/sysdev/cpm2_pic.c |    4 +---
> >  1 file changed, 1 insertion(+), 3 deletions(-)
> > 
> > diff -upr linux-2.6.20-rc2-mm1-a/arch/powerpc/sysdev/cpm2_pic.c linux-2.6.20-rc2-mm1-b/arch/powerpc/sysdev/cpm2_pic.c
> > --- linux-2.6.20-rc2-mm1-a/arch/powerpc/sysdev/cpm2_pic.c	2006-12-24 05:00:32.000000000 +0100
> > +++ linux-2.6.20-rc2-mm1-b/arch/powerpc/sysdev/cpm2_pic.c	2007-01-02 02:04:25.000000000 +0100
> > @@ -245,9 +245,7 @@ void cpm2_pic_init(struct device_node *n
> >  	cpm2_intctl->ic_scprrl = 0x05309770;
> >  
> >  	/* create a legacy host */
> > -	if (node)
> > -		cpm2_pic_node = of_node_get(node);
> > -
> > +	cpm2_pic_node = of_node_get(node);
> 
> This is actually a semantic change, in that cpm2_pic_node always gets
> assigned now, whereas previously it didn't if node == NULL.  Are you
> sure that is OK?  If so, you need to add something to the patch
> description explaining why it is OK.

It's ok to remove 'node' check because in real life cpm2_pic_init() never
gets called with node == NULL.

Signed-off-by: Mariusz Kozlowski <m.kozlowski at tuxland.pl>

 arch/powerpc/sysdev/cpm2_pic.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff -upr linux-2.6.20-rc2-mm1-a/arch/powerpc/sysdev/cpm2_pic.c linux-2.6.20-rc2-mm1-b/arch/powerpc/sysdev/cpm2_pic.c
--- linux-2.6.20-rc2-mm1-a/arch/powerpc/sysdev/cpm2_pic.c	2006-12-24 05:00:32.000000000 +0100
+++ linux-2.6.20-rc2-mm1-b/arch/powerpc/sysdev/cpm2_pic.c	2007-01-02 02:04:25.000000000 +0100
@@ -245,9 +245,7 @@ void cpm2_pic_init(struct device_node *n
 	cpm2_intctl->ic_scprrl = 0x05309770;
 
 	/* create a legacy host */
-	if (node)
-		cpm2_pic_node = of_node_get(node);
-
+	cpm2_pic_node = of_node_get(node);
 	cpm2_pic_host = irq_alloc_host(IRQ_HOST_MAP_LINEAR, 64, &cpm2_pic_host_ops, 64);
 	if (cpm2_pic_host == NULL) {
 		printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n");


-- 
Regards,

	Mariusz Kozlowski



More information about the Linuxppc-dev mailing list