Skip to content

Commit

Permalink
[POWERPC] 85xx: mpc85xx_ads: add in missing of_node_put()
Browse files Browse the repository at this point in the history
Add in missing of_node_put() after cpm2_pic_init(). This and other coding
style cleanups as suggested by Stephen Rothwell.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
  • Loading branch information
Paul Gortmaker authored and Kumar Gala committed Jan 24, 2008
1 parent d7584ed commit e509184
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions arch/powerpc/platforms/85xx/mpc85xx_ads.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
{
int cascade_irq;

while ((cascade_irq = cpm2_get_irq()) >= 0) {
while ((cascade_irq = cpm2_get_irq()) >= 0)
generic_handle_irq(cascade_irq);
}

desc->chip->eoi(irq);
}

Expand All @@ -70,13 +70,12 @@ static void __init mpc85xx_ads_pic_init(void)
#endif

np = of_find_node_by_type(np, "open-pic");

if (np == NULL) {
if (!np) {
printk(KERN_ERR "Could not find open-pic node\n");
return;
}

if(of_address_to_resource(np, 0, &r)) {
if (of_address_to_resource(np, 0, &r)) {
printk(KERN_ERR "Could not map mpic register space\n");
of_node_put(np);
return;
Expand All @@ -100,6 +99,7 @@ static void __init mpc85xx_ads_pic_init(void)
irq = irq_of_parse_and_map(np, 0);

cpm2_pic_init(np);
of_node_put(np);
set_irq_chained_handler(irq, cpm2_cascade);
#endif
}
Expand All @@ -112,7 +112,7 @@ struct cpm_pin {
int port, pin, flags;
};

static struct cpm_pin mpc8560_ads_pins[] = {
static const struct cpm_pin mpc8560_ads_pins[] = {
/* SCC1 */
{3, 29, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
{3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
Expand Down

0 comments on commit e509184

Please sign in to comment.