To prevent future name collisions "chip_t" changed to "canchip_t"

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

diff --git a/lincan/src/aim104.c b/lincan/src/aim104.c
index 8e0fe8f343e34bbce73b56a244676ff4a72604f3..485186bdaee82071157df9f96ac404bdc7dbd4fb 100644 (file)
--- a/lincan/src/aim104.c
+++ b/lincan/src/aim104.c
@@ -129,7 +129,6 @@ int aim104_init_hw_data(struct candevice_t *candev)
        return 0;
 }
 
-#define CHIP_TYPE "sja1000"
 /**
  * template_init_chip_data - Initialize chips
  * @candev: Pointer to candevice/board structure
@@ -161,7 +160,7 @@ int aim104_init_hw_data(struct candevice_t *candev)
  */
 int aim104_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-       candev->chip[chipnr]->chip_type=CHIP_TYPE;
+       sja1000_fill_chipspecops(candev->chip[chipnr]);
        candev->chip[chipnr]->chip_base_addr=candev->io_addr;
        candev->chip[chipnr]->clock = 16000000;
        candev->chip[chipnr]->flags = 0;
@@ -188,7 +187,7 @@ int aim104_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int aim104_init_obj_data(struct chip_t *chip, int objnr)
+int aim104_init_obj_data(struct canchip_t *chip, int objnr)
 {
        chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;
        chip->msgobj[objnr]->obj_flags=0;