Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / macintosh / via-pmu.c

diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index f8b6d14..91081dc 100644 (file)
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -145,7 +145,7 @@ static int pmu_fully_inited;
 static int pmu_has_adb;
 static struct device_node *gpio_node;
 static unsigned char __iomem *gpio_reg;
-static int gpio_irq = NO_IRQ;
+static int gpio_irq = 0;
 static int gpio_irq_enabled = -1;
 static volatile int pmu_suspended;
 static spinlock_t pmu_lock;
@@ -402,7 +402,7 @@ static int __init via_pmu_start(void)
        batt_req.complete = 1;
 
        irq = irq_of_parse_and_map(vias, 0);
-       if (irq == NO_IRQ) {
+       if (!irq) {
                printk(KERN_ERR "via-pmu: can't map interrupt\n");
                return -ENODEV;
        }
@@ -424,7 +424,7 @@ static int __init via_pmu_start(void)
                if (gpio_node)
                        gpio_irq = irq_of_parse_and_map(gpio_node, 0);
 
-               if (gpio_irq != NO_IRQ) {
+               if (gpio_irq) {
                        if (request_irq(gpio_irq, gpio1_interrupt,
                                        IRQF_NO_SUSPEND, "GPIO1 ADB",
                                        (void *)0))