From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Sun, 24 Jun 2012 19:04:21 +0000 (+0200)
Subject: Use mdelay instead of udelay for long times.
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/074e90ee2a9a0a573bc987097650e9c1ec233337

Use mdelay instead of udelay for long times.

The delays are required mostly for old, incorrectly
engineered CAN boards. So use of mdelay is deprecated
as well.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
---

diff --git a/lincan/src/aim104.c b/lincan/src/aim104.c
index 357fe41..d1db454 100644
--- a/lincan/src/aim104.c
+++ b/lincan/src/aim104.c
@@ -111,7 +111,7 @@ int aim104_reset(struct candevice_t *candev)
 	i=0;
 	while ( (aim104_read_register(candev->io_addr + SJACR)
 							& sjaCR_RR) && (i<=15) ) {
-		udelay(20000);
+		mdelay(20);
 		i++;
 	}
 	if (i>=15) {
diff --git a/lincan/src/m437.c b/lincan/src/m437.c
index 55f1d99..da772e8 100644
--- a/lincan/src/m437.c
+++ b/lincan/src/m437.c
@@ -202,7 +202,7 @@ int m437_reset(struct candevice_t *candev)
 	/* Check hardware reset status */
 	i=0;
 	while ( (m437_read_register(candev->dev_base_addr+iCPU) & iCPU_RST) && (i<=15)) {
-		udelay(20000);
+		mdelay(20);
 		i++;
 	}
 	if (i>=15) {
diff --git a/lincan/src/nsi.c b/lincan/src/nsi.c
index 3aa8c14..aac7eff 100644
--- a/lincan/src/nsi.c
+++ b/lincan/src/nsi.c
@@ -98,7 +98,7 @@ int nsi_reset(struct candevice_t *candev)
     /* Check hardware reset status */
     i=0;
     while ( (nsi_read_register(nsican_base+iCPU) & iCPU_RST) && (i<=15)) {
-	udelay(20000);
+	mdelay(20);
 	i++;
     }
     if (i>=15) {
diff --git a/lincan/src/pc_i03.c b/lincan/src/pc_i03.c
index f20b0ac..cd461af 100644
--- a/lincan/src/pc_i03.c
+++ b/lincan/src/pc_i03.c
@@ -112,7 +112,7 @@ int pci03_reset(struct candevice_t *candev)
 	DEBUGMSG("Resetting pc-i03 hardware ...\n");
 	pci03_write_register(0x01,pci03_base_addr +
 				0x100); // Write arbitrary data to reset mem
-	udelay(20000);
+	mdelay(20);
 
 	pci03_write_register(0x00, pci03_base_addr + SJACR);
 
@@ -120,7 +120,7 @@ int pci03_reset(struct candevice_t *candev)
 	i=0;
 	while ( (pci03_read_register(pci03_base_addr + SJACR) & sjaCR_RR)
 								 && (i<=15) ) {
-		udelay(20000);
+		mdelay(20);
 		i++;
 	}
 	if (i>=15) {
diff --git a/lincan/src/pccan.c b/lincan/src/pccan.c
index 7086151..4e9385d 100644
--- a/lincan/src/pccan.c
+++ b/lincan/src/pccan.c
@@ -142,7 +142,7 @@ int pccanf_reset(struct candevice_t *candev)
 	i=0;
 	while ( (can_inb(candev->chip[0]->chip_base_addr+SJACR) & sjaCR_RR)
 								 && (i<=15) ) {
-		udelay(20000);
+		mdelay(20);
 		i++;
 	}
 	if (i>=15) {
@@ -175,7 +175,7 @@ int pccand_reset(struct candevice_t *candev)
 		i=0;
 		while ( (can_inb(candev->chip[chip_nr]->chip_base_addr +
 						SJACR) & sjaCR_RR) && (i<=15) ) {
-			udelay(20000);
+			mdelay(20);
 			i++;
 		}
 		if (i>=15) {
@@ -211,7 +211,7 @@ int pccanq_reset(struct candevice_t *candev)
 		i=0;
 		while( (can_inb(candev->chip[chip_nr]->chip_base_addr +
 						iCPU) & iCPU_RST) && (i<=15) ) {
-			udelay(20000);
+			mdelay(20);
 			i++;
 		}
 		if (i>=15) {
@@ -226,7 +226,7 @@ int pccanq_reset(struct candevice_t *candev)
 		i=0;
 		while( (can_inb(candev->chip[chip_nr]->chip_base_addr +
 						SJACR) & sjaCR_RR) && (i<=15) ) {
-			udelay(20000);
+			mdelay(20);
 			i++;
 		}
 		if (i>=15) {
diff --git a/lincan/src/pcccan.c b/lincan/src/pcccan.c
index a84fca1..c10893c 100644
--- a/lincan/src/pcccan.c
+++ b/lincan/src/pcccan.c
@@ -135,7 +135,7 @@ int pcccan_reset(struct candevice_t *candev)
 	i=0;
 	can_outb(iCPU,candev->io_addr+0x1);
 	while ( (can_inb(candev->io_addr+0x2)&0x80) && (i<=15) ) {
-		udelay(20000);
+		mdelay(20);
 		i++;
 	}
 	if (i>=15) {
diff --git a/lincan/src/pip.c b/lincan/src/pip.c
index 2f1e232..345dd78 100644
--- a/lincan/src/pip.c
+++ b/lincan/src/pip.c
@@ -99,7 +99,7 @@ int pip_reset(struct candevice_t *candev)
 	/* Check hardware reset status */
 	i = 0;
 	while ((can_inb(candev->io_addr + iCPU) & iCPU_RST) && (i <= 15)) {
-		udelay(20000);
+		mdelay(20);
 		i++;
 	}
 	if (i >= 15) {
diff --git a/lincan/src/smartcan.c b/lincan/src/smartcan.c
index 9c6d5e8..a748566 100644
--- a/lincan/src/smartcan.c
+++ b/lincan/src/smartcan.c
@@ -78,7 +78,7 @@ int smartcan_reset(struct candevice_t *candev)
 	i=0;
 	can_outb(candev->io_addr+iCPU,candev->io_addr);
 	while ( (can_inb(candev->io_addr+1)&0x80) && (i<=15) ) {
-		udelay(20000);
+		mdelay(20);
 		i++;
 	}
 	if (i>=15) {
diff --git a/lincan/src/ssv.c b/lincan/src/ssv.c
index 530859d..e08a9b6 100644
--- a/lincan/src/ssv.c
+++ b/lincan/src/ssv.c
@@ -98,7 +98,7 @@ int ssv_reset(struct candevice_t *candev)
     /* Check hardware reset status */
     i=0;
     while ( (ssv_read_register(ssvcan_base+iCPU) & iCPU_RST) && (i<=15)) {
-	udelay(20000);
+	mdelay(20);
 	i++;
     }
     if (i>=15) {
@@ -112,7 +112,7 @@ int ssv_reset(struct candevice_t *candev)
     /* Check hardware reset status */
     i=0;
     while ( (ssv_read_register(ssvcan_base+0x100+iCPU) & iCPU_RST) && (i<=15)) {
-	udelay(20000);
+	mdelay(20);
 	i++;
     }
     if (i>=15) {