First part of IRQ handling changes

[lincan.git] / lincan / src / sja1000.c

diff --git a/lincan/src/sja1000.c b/lincan/src/sja1000.c
index d5f7b1557864a2d5e027eb854d696c6a1b5eaed8..dfc47a290f3df84a0e239ffe4d7c1c61debe6f4b 100644 (file)
--- a/lincan/src/sja1000.c
+++ b/lincan/src/sja1000.c
@@ -331,10 +331,9 @@ int sja1000_config_irqs(struct chip_t *chip, short irqs)
 }
 
 
-can_irqreturn_t sja1000_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
+int sja1000_irq_handler(int irq, struct chip_t *chip)
 {
        unsigned irq_register;
-       struct chip_t *chip=(struct chip_t *)dev_id;
        struct msgobj_t *obj=chip->msgobj[0];
 
        irq_register=can_read_reg(chip, SJAIR);
@@ -343,7 +342,7 @@ can_irqreturn_t sja1000_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
 //                                     can_read_reg(chip, SJASR));
 
        if ((irq_register & (sjaIR_WUI|sjaIR_DOI|sjaIR_EI|sjaIR_TI|sjaIR_RI)) == 0)
-               return CAN_IRQ_NONE;
+               return CANCHIP_IRQ_NONE;
 
        if ((irq_register & sjaIR_RI) != 0) 
                sja1000_irq_read_handler(chip, obj);
@@ -376,7 +375,7 @@ can_irqreturn_t sja1000_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
                }
        }
 
-       return CAN_IRQ_HANDLED;
+       return CANCHIP_IRQ_HANDLED;
 }
 
 void sja1000_irq_read_handler(struct chip_t *chip, struct msgobj_t *obj)