Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...

[cascardo/linux.git] / drivers / macintosh / smu.c

diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index d6f72c8..08edb2c 100644 (file)
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -279,7 +279,7 @@ int smu_queue_cmd(struct smu_cmd *cmd)
        spin_unlock_irqrestore(&smu->lock, flags);
 
        /* Workaround for early calls when irq isn't available */
-       if (!smu_irq_inited || smu->db_irq == NO_IRQ)
+       if (!smu_irq_inited || !smu->db_irq)
                smu_spinwait_cmd(cmd);
 
        return 0;
@@ -498,8 +498,8 @@ int __init smu_init (void)
        INIT_LIST_HEAD(&smu->cmd_list);
        INIT_LIST_HEAD(&smu->cmd_i2c_list);
        smu->of_node = np;
-       smu->db_irq = NO_IRQ;
-       smu->msg_irq = NO_IRQ;
+       smu->db_irq = 0;
+       smu->msg_irq = 0;
 
        /* smu_cmdbuf_abs is in the low 2G of RAM, can be converted to a
         * 32 bits value safely
@@ -587,13 +587,13 @@ static int smu_late_init(void)
 
        if (smu->db_node) {
                smu->db_irq = irq_of_parse_and_map(smu->db_node, 0);
-               if (smu->db_irq == NO_IRQ)
+               if (!smu->db_irq)
                        printk(KERN_ERR "smu: failed to map irq for node %s\n",
                               smu->db_node->full_name);
        }
        if (smu->msg_node) {
                smu->msg_irq = irq_of_parse_and_map(smu->msg_node, 0);
-               if (smu->msg_irq == NO_IRQ)
+               if (!smu->msg_irq)
                        printk(KERN_ERR "smu: failed to map irq for node %s\n",
                               smu->msg_node->full_name);
        }
@@ -602,23 +602,23 @@ static int smu_late_init(void)
         * Try to request the interrupts
         */
 
-       if (smu->db_irq != NO_IRQ) {
+       if (smu->db_irq) {
                if (request_irq(smu->db_irq, smu_db_intr,
                                IRQF_SHARED, "SMU doorbell", smu) < 0) {
                        printk(KERN_WARNING "SMU: can't "
                               "request interrupt %d\n",
                               smu->db_irq);
-                       smu->db_irq = NO_IRQ;
+                       smu->db_irq = 0;
                }
        }
 
-       if (smu->msg_irq != NO_IRQ) {
+       if (smu->msg_irq) {
                if (request_irq(smu->msg_irq, smu_msg_intr,
                                IRQF_SHARED, "SMU message", smu) < 0) {
                        printk(KERN_WARNING "SMU: can't "
                               "request interrupt %d\n",
                               smu->msg_irq);
-                       smu->msg_irq = NO_IRQ;
+                       smu->msg_irq = 0;
                }
        }