From: wolf <wolf@030b6a49-0b11-0410-94ab-b0dab22257f2>
Date: Sat, 14 Feb 2009 20:40:46 +0000 (+0000)
Subject: SJA1000: more cleanup and use SJA1000_MAX_IRQ instead of a plain number
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/socketcan-devel.git/commitdiff_plain/27afbc9398d740f8028d0085ef0f7c7b680c62ff

SJA1000: more cleanup and use SJA1000_MAX_IRQ instead of a plain number

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>


git-svn-id: svn://svn.berlios.de//socketcan/trunk@944 030b6a49-0b11-0410-94ab-b0dab22257f2
---

diff --git a/kernel/2.6/drivers/net/can/sja1000/sja1000.c b/kernel/2.6/drivers/net/can/sja1000/sja1000.c
index 0519a4a..2a52399 100644
--- a/kernel/2.6/drivers/net/can/sja1000/sja1000.c
+++ b/kernel/2.6/drivers/net/can/sja1000/sja1000.c
@@ -535,7 +535,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
 	if (priv->pre_irq)
 		priv->pre_irq(dev);
 
-	while ((isrc = priv->read_reg(dev, REG_IR)) && (n < 20)) {
+	while ((isrc = priv->read_reg(dev, REG_IR)) && (n < SJA1000_MAX_IRQ)) {
 		n++;
 		status = priv->read_reg(dev, REG_SR);
 
@@ -566,8 +566,8 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
 	if (priv->post_irq)
 		priv->post_irq(dev);
 
-	if (n >= 20)
-		dev_dbg(ND2D(dev), "Many messages handled in ISR");
+	if (n >= SJA1000_MAX_IRQ)
+		dev_dbg(ND2D(dev), "%d messages handled in ISR", n);
 
 	return (n) ? IRQ_HANDLED : IRQ_NONE;
 }
diff --git a/kernel/2.6/drivers/net/can/sja1000/sja1000.h b/kernel/2.6/drivers/net/can/sja1000/sja1000.h
index 29993b9..26488ae 100644
--- a/kernel/2.6/drivers/net/can/sja1000/sja1000.h
+++ b/kernel/2.6/drivers/net/can/sja1000/sja1000.h
@@ -46,16 +46,14 @@
  *
  */
 
-#ifndef SJA1000DEV_H
-#define SJA1000DEV_H
+#ifndef SJA1000_DEV_H
+#define SJA1000_DEV_H
 
 #include <linux/version.h>
 #include <linux/can/dev.h>
 #include <linux/can/platform/sja1000.h>
 
-#define TX_TIMEOUT      (50*HZ/1000)	/* 50ms */
-#define RESTART_MS      100	/* restart chip on persistent errors in 100ms */
-#define MAX_BUS_ERRORS  200	/* prevent from flooding bus error interrupts */
+#define SJA1000_MAX_IRQ 20	/* max. number of interrupts handled in ISR */
 
 /* SJA1000 registers - manual section 6.4 (Pelican Mode) */
 #define REG_MOD		0x00
@@ -149,10 +147,8 @@
 /*
  * Flags for sja1000priv.flags
  */
-
 #define SJA1000_CUSTOM_IRQ_HANDLER 0x1
 
-
 /*
  * SJA1000 private data structure
  */