From d84a1f61c0219379980f257b6115c517989d1560 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 25 Mar 2011 11:12:27 +0000 Subject: [PATCH] --- yaml --- r: 242945 b: refs/heads/master c: 256d0e2e4553417466ca8213b446954ff1778c2c h: refs/heads/master i: 242943: 692b4e33f6a74363a1a857aeb81eca632af82a77 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/88pm860x-core.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 489f69c1127d..dde6f2b7bf21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52a7d60775aa447b3a3dc685b7006f7cdc7835dd +refs/heads/master: 256d0e2e4553417466ca8213b446954ff1778c2c diff --git a/trunk/drivers/mfd/88pm860x-core.c b/trunk/drivers/mfd/88pm860x-core.c index 9c511c1604a5..e13e9f0f6d70 100644 --- a/trunk/drivers/mfd/88pm860x-core.c +++ b/trunk/drivers/mfd/88pm860x-core.c @@ -416,7 +416,6 @@ static int __devinit device_irq_init(struct pm860x_chip *chip, : chip->companion; unsigned char status_buf[INT_STATUS_NUM]; unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT; - struct irq_desc *desc; int i, data, mask, ret = -EINVAL; int __irq; @@ -468,8 +467,6 @@ static int __devinit device_irq_init(struct pm860x_chip *chip, if (!chip->core_irq) goto out; - desc = irq_to_desc(chip->core_irq); - /* register IRQ by genirq */ for (i = 0; i < ARRAY_SIZE(pm860x_irqs); i++) { __irq = i + chip->irq_base;