From 1e72b549c6a2d250715157c61ec6920808e20596 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Wed, 2 Jan 2008 12:50:01 -0500 Subject: [PATCH] --- yaml --- r: 81295 b: refs/heads/master c: e5091842dc067c0c9ae0d8a26f9e2eecf7df34f3 h: refs/heads/master i: 81293: 80c5adfe71278a57f7ab57681fb157845de2a808 81291: beabdd38687785d9f8289d6b500e11c4525609de 81287: c5064e1b2afe87703023e8b3e3e6ce411fa5d3e0 81279: 0d6feb905759c65cf995cd6d4fc7c6eb8541772c v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/85xx/mpc85xx_ads.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f227b534fb02..1650be808645 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7584ed2b994a572326650b0c4d2c25961e6f49d +refs/heads/master: e5091842dc067c0c9ae0d8a26f9e2eecf7df34f3 diff --git a/trunk/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/trunk/arch/powerpc/platforms/85xx/mpc85xx_ads.c index eb0a46bb1ccc..4e0305096114 100644 --- a/trunk/arch/powerpc/platforms/85xx/mpc85xx_ads.c +++ b/trunk/arch/powerpc/platforms/85xx/mpc85xx_ads.c @@ -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); } @@ -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; @@ -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 } @@ -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},