Skip to contentSkip to conversation

powerpc: fix compile error with 85xx/p1023_rds.c

PATCH New Michael Neuling 2 participants 2 messages Dec 8, 2011 – Dec 9, 2011

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: fix compile error with 85xx/p1023_rds.c

Current linux-next compiled with mpc85xx_smp_defconfig causes this:
arch/powerpc/platforms/85xx/p1023_rds.c: In function 'mpc85xx_rds_pic_init':
arch/powerpc/platforms/85xx/p1023_rds.c:102:14: error: 'np' undeclared (first use in this function) arch/powerpc/platforms/85xx/p1023_rds.c:102:14: note: each undeclared identifier is reported only once for each function it appears in

Introduced in:
commit 996983b75cebb1bc1c2c545f20336f24ebfa17af
Author: Kyle Moffett <[email protected]>
Date: Fri Dec 2 06:28:02 2011 +0000
powerpc/mpic: Search for open-pic device-tree node if NULL

arch/powerpc/platforms/85xx/p1023_rds.c +0 -1
index e92a714..d951e70 100644
@@ -99,7 +99,6 @@ static void __init mpc85xx_rds_pic_init(void)
 		0, 256, " OpenPIC  ");
 
 	BUG_ON(mpic == NULL);
-	of_node_put(np);
 
 	mpic_init(mpic);
 }
#1 lore raw

PATCH 1/1 powerpc: fix compile error with 85xx/p1010rdb.c

Current linux-next compiled with mpc85xx_defconfig causes this:

arch/powerpc/platforms/85xx/p1010rdb.c:41:14: error: 'np' undeclared (first use in this function) arch/powerpc/platforms/85xx/p1023_rds.c:102:14: error: 'np' undeclared (first use in this function)

Introduced in:
commit 996983b75cebb1bc1c2c545f20336f24ebfa17af
Author: Kyle Moffett <[email protected]>
Date: Fri Dec 2 06:28:02 2011 +0000
powerpc/mpic: Search for open-pic device-tree node if NULL

---
Mikey already posted a fix for p1023_rds.c. I think this is the last one.

 arch/powerpc/platforms/85xx/p1010rdb.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
arch/powerpc/platforms/85xx/p1010rdb.c +0 -2
index 894f1e8..538bc3f 100644
@@ -38,10 +38,8 @@ void __init p1010_rdb_pic_init(void)
          0, 256, " OpenPIC  ");
 
        BUG_ON(mpic == NULL);
-       of_node_put(np);
 
        mpic_init(mpic);
-
 }
 

Yours Tony