Structured comments updated.

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

diff --git a/lincan/src/pccan.c b/lincan/src/pccan.c
index 8745404147e7fd5ed733519ff5d73d949a60554c..6e32610f2eea474b1ca1bb284a97ffdb13df3823 100644 (file)
--- a/lincan/src/pccan.c
+++ b/lincan/src/pccan.c
@@ -169,7 +169,7 @@ int pccanq_reset(struct candevice_t *candev)
        int i=0,chip_nr=0;
 
        for (i=0; i<4; i++)
-               disable_irq(candev->chip[i]->chip_irq);
+               can_disable_irq(candev->chip[i]->chip_irq);
 
        DEBUGMSG("Resetting pccan-q hardware ...\n");
        while (i < 100000) {
@@ -214,7 +214,7 @@ int pccanq_reset(struct candevice_t *candev)
        }
 
        for (i=0; i<4; i++)
-               enable_irq(candev->chip[i]->chip_irq);
+               can_enable_irq(candev->chip[i]->chip_irq);
 
        return 0;
 }      
@@ -290,12 +290,10 @@ int pccan_init_obj_data(struct chip_t *chip, int objnr)
 {
        if (!strcmp(chip->chip_type,"sja1000")) {
                chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;
-               chip->msgobj[objnr]->flags=0;
-       }
+               }
        else {  /* The spacing for this card is 0x3c0 */
                chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr+(objnr+1)*0x10+(int)((objnr+1)/4)*0x3c0;
-               chip->msgobj[objnr]->flags=0;
-       }
+               }
 
        return 0;
 }