From: ppisa <ppisa>
Date: Mon, 5 Jun 2006 00:07:14 +0000 (+0000)
Subject: The use of chip->chip_data is unnecessary, chip->hostdevice points to corresponding... 
X-Git-Tag: CLT_COMM_CAN_pre_ul_log_introduction~6
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/a2eb4407e9772cf1057e7ea093250d5d38245c1d

The use of chip->chip_data is unnecessary, chip->hostdevice points to corresponding candevice_t.
Change not checked on real hardware.
---

diff --git a/lincan/src/nsi_canpci.c b/lincan/src/nsi_canpci.c
index e3e607e..9fbed11 100644
--- a/lincan/src/nsi_canpci.c
+++ b/lincan/src/nsi_canpci.c
@@ -90,7 +90,7 @@ int nsi_canpci_config_irqs(struct canchip_t *chip, short irqs)
 			DEBUGMSG("starting interrupt on chip 1\n");
 			it_mask=8;
 		}
-		candev=(struct candevice_t *)chip->chip_data;
+		candev=chip->hostdevice;
 		it_reg = ioread32( (void*)(candev->io_addr+PLX_INTCSR));
 		it_reg|=it_mask|0x40;
 		iowrite32(it_reg,(void*)(candev->io_addr+PLX_INTCSR));
@@ -107,7 +107,7 @@ int nsi_canpci_config_irqs(struct canchip_t *chip, short irqs)
 			DEBUGMSG("stoping interrupt on chip 1\n");
 			it_mask=8;
 		}
-		candev=(struct candevice_t *)chip->chip_data;
+		candev=chip->hostdevice;
 		it_reg = ioread32( (void*)(candev->io_addr+PLX_INTCSR));
 		it_reg&=~it_mask;
 		iowrite32(it_reg,(void*)(candev->io_addr+PLX_INTCSR));
@@ -190,7 +190,7 @@ int nsi_canpci_start_chip(struct canchip_t *chip)
 		DEBUGMSG("starting chip 1\n");
 		it_mask=8;
 	}
-	candev=(struct candevice_t *)chip->chip_data;
+	candev=chip->hostdevice;
 	it_reg = ioread32( (void*)(candev->io_addr+PLX_INTCSR));
 	rmb();
 	it_reg|=it_mask|0x40;
@@ -215,7 +215,7 @@ int nsi_canpci_stop_chip(struct canchip_t *chip)
 		DEBUGMSG("stoping chip 1\n");
 		it_mask=8;
 	}
-	candev=(struct candevice_t *)chip->chip_data;
+	candev=chip->hostdevice;
 	it_reg = ioread32( (void*)(candev->io_addr+PLX_INTCSR));
 	rmb();
 	it_reg&=~it_mask;
@@ -230,7 +230,7 @@ int nsi_canpci_irq_handler(int irq, struct canchip_t *chip)
 	int retcode;
 	unsigned long it_reg;
 	struct candevice_t *candev;
-	candev=(struct candevice_t *)chip->chip_data;
+	candev=chip->hostdevice;
 	retcode = CANCHIP_IRQ_NONE;
 	it_reg = ioread32( (void*)(candev->io_addr+PLX_INTCSR));
 	rmb();
@@ -470,7 +470,7 @@ int nsi_canpci_init_chip_data(struct candevice_t *candev, int chipnr)
 	candev->chip[chipnr]->chipspecops->stop_chip=nsi_canpci_stop_chip;
 	candev->chip[chipnr]->chipspecops->config_irqs=nsi_canpci_config_irqs;
 	candev->chip[chipnr]->chipspecops->irq_handler=nsi_canpci_irq_handler;
-	candev->chip[chipnr]->chip_data =candev;
+	/*candev->chip[chipnr]->chip_data = NULL;*/
 	
 	candev->chip[chipnr]->chip_base_addr= (unsigned long) (((t_CardArray*)(candev->dev_base_addr))->addr_BAR_remap[chipnr+2]);
 	candev->chip[chipnr]->clock = iCLOCK;
@@ -528,10 +528,6 @@ void nsi_canpci_write_register(unsigned data, unsigned long address)
  */
 unsigned nsi_canpci_read_register(unsigned long address)
 {
-    /* this is the same thing that the function write_register.
-       We use the two register, we write the address where we 
-       want to read in a first time. In a second time we read the
-       data */
 	return ioread8((void*)address);
 }