LinCAN driver updated to work on Real-Time Preemption enabled kernel.

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

diff --git a/lincan/src/ssv.c b/lincan/src/ssv.c
index 7f147e116ac8247c014c5c74417116d7e59b2181..45aef4b91ae26225b5ddb6d1f08701dd1d3c9d37 100644 (file)
--- a/lincan/src/ssv.c
+++ b/lincan/src/ssv.c
@@ -14,7 +14,7 @@
 int ssvcan_irq[2]={-1,-1};
 unsigned long ssvcan_base=0x0;
 
-static can_spinlock_t ssv_port_lock=SPIN_LOCK_UNLOCKED;
+static CAN_DEFINE_SPINLOCK(ssv_port_lock);
 
 /* IO_RANGE is the io-memory range that gets reserved, please adjust according
  * your hardware. Example: #define IO_RANGE 0x100 for i82527 chips or
@@ -159,7 +159,7 @@ int ssv_init_chip_data(struct candevice_t *candev, int chipnr)
  * base address.
  * Unless the hardware uses a segmented memory map, flags can be set zero.
  */
-int ssv_init_obj_data(struct chip_t *chip, int objnr)
+int ssv_init_obj_data(struct canchip_t *chip, int objnr)
 {
 
     chip->msgobj[objnr]->obj_base_addr=