Merge: Correction for 2.6.23-git kernel - unregister_chrdev() does not return value.

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

diff --git a/lincan/src/smartcan.c b/lincan/src/smartcan.c
index f9123fe93a3846bb0e58762fcfb3bdbcf0ea28f8..f83d8d90a8a051c67a99941230a9fe9299c6dea3 100644 (file)
--- a/lincan/src/smartcan.c
+++ b/lincan/src/smartcan.c
@@ -16,7 +16,7 @@
 int smartcan_irq=-1;
 unsigned long smartcan_base=0x0;
 
-static can_spinlock_t smartcan_port_lock=SPIN_LOCK_UNLOCKED;
+static CAN_DEFINE_SPINLOCK(smartcan_port_lock);
 
 int smartcan_request_io(struct candevice_t *candev)
 {
@@ -41,17 +41,17 @@ int smartcan_reset(struct candevice_t *candev)
        int i=0;
 
        DEBUGMSG("Resetting smartcan hardware ...\n");
-       outb(0x00,candev->res_addr);
+       can_outb(0x00,candev->res_addr);
        while (i < 1000000) {
                i++;
-               outb(0x01,candev->res_addr);
+               can_outb(0x01,candev->res_addr);
        }
-       outb(0x00,candev->res_addr); 
+       can_outb(0x00,candev->res_addr); 
 
        /* Check hardware reset status */
        i=0;
-       outb(candev->io_addr+iCPU,candev->io_addr);
-       while ( (inb(candev->io_addr+1)&0x80) && (i<=15) ) {
+       can_outb(candev->io_addr+iCPU,candev->io_addr);
+       while ( (can_inb(candev->io_addr+1)&0x80) && (i<=15) ) {
                udelay(20000);
                i++;
        }
@@ -79,7 +79,7 @@ int smartcan_init_hw_data(struct candevice_t *candev)
 int smartcan_init_chip_data(struct candevice_t *candev, int chipnr)
 {
        i82527_fill_chipspecops(candev->chip[chipnr]);
-       candev->chip[chipnr]->chip_base_addr=candev->io_addr;
+       candev->chip[chipnr]->chip_base_addr=can_ioport2ioptr(candev->io_addr);
        candev->chip[chipnr]->clock = 16000000;
        candev->chip[chipnr]->int_cpu_reg = iCPU_DSC;
        candev->chip[chipnr]->int_clk_reg = iCLK_SL1;
@@ -92,7 +92,7 @@ int smartcan_init_chip_data(struct candevice_t *candev, int chipnr)
        return 0;
 }
 
-int smartcan_init_obj_data(struct chip_t *chip, int objnr)
+int smartcan_init_obj_data(struct canchip_t *chip, int objnr)
 {
        chip->msgobj[objnr]->obj_base_addr=(objnr+1)*0x10;
 
@@ -100,22 +100,22 @@ int smartcan_init_obj_data(struct chip_t *chip, int objnr)
 }
 
 
-void smartcan_write_register(unsigned data, unsigned long address)
+void smartcan_write_register(unsigned data, can_ioptr_t address)
 {
        can_spin_irqflags_t flags;
        can_spin_lock_irqsave(&smartcan_port_lock,flags);
-       outb(address-smartcan_base,smartcan_base);
-       outb(data,smartcan_base+1);
+       can_outb(address-smartcan_base,smartcan_base);
+       can_outb(data,smartcan_base+1);
        can_spin_unlock_irqrestore(&smartcan_port_lock,flags);
 }
 
-unsigned smartcan_read_register(unsigned long address)
+unsigned smartcan_read_register(can_ioptr_t address)
 {
        unsigned ret;
        can_spin_irqflags_t flags;
        can_spin_lock_irqsave(&smartcan_port_lock,flags);
-       outb(address-smartcan_base,smartcan_base);
-       ret=inb(smartcan_base+1);
+       can_outb(address-smartcan_base,smartcan_base);
+       ret=can_inb(smartcan_base+1);
        can_spin_unlock_irqrestore(&smartcan_port_lock,flags);
        return ret;
 }