Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[~andy/linux] / drivers / net / can / sja1000 / sja1000.c

diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index e4df307eaa9081b9e39a81731714e0bd3969ea3b..7164a999f50ff37e176f9995f21cd04451f17043 100644 (file)
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -91,14 +91,14 @@ static void sja1000_write_cmdreg(struct sja1000_priv *priv, u8 val)
         * the write_reg() operation - especially on SMP systems.
         */
        spin_lock_irqsave(&priv->cmdreg_lock, flags);
-       priv->write_reg(priv, REG_CMR, val);
-       priv->read_reg(priv, SJA1000_REG_SR);
+       priv->write_reg(priv, SJA1000_CMR, val);
+       priv->read_reg(priv, SJA1000_SR);
        spin_unlock_irqrestore(&priv->cmdreg_lock, flags);
 }
 
 static int sja1000_is_absent(struct sja1000_priv *priv)
 {
-       return (priv->read_reg(priv, REG_MOD) == 0xFF);
+       return (priv->read_reg(priv, SJA1000_MOD) == 0xFF);
 }
 
 static int sja1000_probe_chip(struct net_device *dev)
@@ -116,11 +116,11 @@ static int sja1000_probe_chip(struct net_device *dev)
 static void set_reset_mode(struct net_device *dev)
 {
        struct sja1000_priv *priv = netdev_priv(dev);
-       unsigned char status = priv->read_reg(priv, REG_MOD);
+       unsigned char status = priv->read_reg(priv, SJA1000_MOD);
        int i;
 
        /* disable interrupts */
-       priv->write_reg(priv, REG_IER, IRQ_OFF);
+       priv->write_reg(priv, SJA1000_IER, IRQ_OFF);
 
        for (i = 0; i < 100; i++) {
                /* check reset bit */
@@ -129,9 +129,10 @@ static void set_reset_mode(struct net_device *dev)
                        return;
                }
 
-               priv->write_reg(priv, REG_MOD, MOD_RM); /* reset chip */
+               /* reset chip */
+               priv->write_reg(priv, SJA1000_MOD, MOD_RM);
                udelay(10);
-               status = priv->read_reg(priv, REG_MOD);
+               status = priv->read_reg(priv, SJA1000_MOD);
        }
 
        netdev_err(dev, "setting SJA1000 into reset mode failed!\n");
@@ -140,7 +141,7 @@ static void set_reset_mode(struct net_device *dev)
 static void set_normal_mode(struct net_device *dev)
 {
        struct sja1000_priv *priv = netdev_priv(dev);
-       unsigned char status = priv->read_reg(priv, REG_MOD);
+       unsigned char status = priv->read_reg(priv, SJA1000_MOD);
        int i;
 
        for (i = 0; i < 100; i++) {
@@ -149,22 +150,22 @@ static void set_normal_mode(struct net_device *dev)
                        priv->can.state = CAN_STATE_ERROR_ACTIVE;
                        /* enable interrupts */
                        if (priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)
-                               priv->write_reg(priv, REG_IER, IRQ_ALL);
+                               priv->write_reg(priv, SJA1000_IER, IRQ_ALL);
                        else
-                               priv->write_reg(priv, REG_IER,
+                               priv->write_reg(priv, SJA1000_IER,
                                                IRQ_ALL & ~IRQ_BEI);
                        return;
                }
 
                /* set chip to normal mode */
                if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)
-                       priv->write_reg(priv, REG_MOD, MOD_LOM);
+                       priv->write_reg(priv, SJA1000_MOD, MOD_LOM);
                else
-                       priv->write_reg(priv, REG_MOD, 0x00);
+                       priv->write_reg(priv, SJA1000_MOD, 0x00);
 
                udelay(10);
 
-               status = priv->read_reg(priv, REG_MOD);
+               status = priv->read_reg(priv, SJA1000_MOD);
        }
 
        netdev_err(dev, "setting SJA1000 into normal mode failed!\n");
@@ -179,9 +180,9 @@ static void sja1000_start(struct net_device *dev)
                set_reset_mode(dev);
 
        /* Clear error counters and error code capture */
-       priv->write_reg(priv, REG_TXERR, 0x0);
-       priv->write_reg(priv, REG_RXERR, 0x0);
-       priv->read_reg(priv, REG_ECC);
+       priv->write_reg(priv, SJA1000_TXERR, 0x0);
+       priv->write_reg(priv, SJA1000_RXERR, 0x0);
+       priv->read_reg(priv, SJA1000_ECC);
 
        /* leave reset mode */
        set_normal_mode(dev);
@@ -217,8 +218,8 @@ static int sja1000_set_bittiming(struct net_device *dev)
 
        netdev_info(dev, "setting BTR0=0x%02x BTR1=0x%02x\n", btr0, btr1);
 
-       priv->write_reg(priv, REG_BTR0, btr0);
-       priv->write_reg(priv, REG_BTR1, btr1);
+       priv->write_reg(priv, SJA1000_BTR0, btr0);
+       priv->write_reg(priv, SJA1000_BTR1, btr1);
 
        return 0;
 }
@@ -228,8 +229,8 @@ static int sja1000_get_berr_counter(const struct net_device *dev,
 {
        struct sja1000_priv *priv = netdev_priv(dev);
 
-       bec->txerr = priv->read_reg(priv, REG_TXERR);
-       bec->rxerr = priv->read_reg(priv, REG_RXERR);
+       bec->txerr = priv->read_reg(priv, SJA1000_TXERR);
+       bec->rxerr = priv->read_reg(priv, SJA1000_RXERR);
 
        return 0;
 }
@@ -247,20 +248,20 @@ static void chipset_init(struct net_device *dev)
        struct sja1000_priv *priv = netdev_priv(dev);
 
        /* set clock divider and output control register */
-       priv->write_reg(priv, REG_CDR, priv->cdr | CDR_PELICAN);
+       priv->write_reg(priv, SJA1000_CDR, priv->cdr | CDR_PELICAN);
 
        /* set acceptance filter (accept all) */
-       priv->write_reg(priv, REG_ACCC0, 0x00);
-       priv->write_reg(priv, REG_ACCC1, 0x00);
-       priv->write_reg(priv, REG_ACCC2, 0x00);
-       priv->write_reg(priv, REG_ACCC3, 0x00);
+       priv->write_reg(priv, SJA1000_ACCC0, 0x00);
+       priv->write_reg(priv, SJA1000_ACCC1, 0x00);
+       priv->write_reg(priv, SJA1000_ACCC2, 0x00);
+       priv->write_reg(priv, SJA1000_ACCC3, 0x00);
 
-       priv->write_reg(priv, REG_ACCM0, 0xFF);
-       priv->write_reg(priv, REG_ACCM1, 0xFF);
-       priv->write_reg(priv, REG_ACCM2, 0xFF);
-       priv->write_reg(priv, REG_ACCM3, 0xFF);
+       priv->write_reg(priv, SJA1000_ACCM0, 0xFF);
+       priv->write_reg(priv, SJA1000_ACCM1, 0xFF);
+       priv->write_reg(priv, SJA1000_ACCM2, 0xFF);
+       priv->write_reg(priv, SJA1000_ACCM3, 0xFF);
 
-       priv->write_reg(priv, REG_OCR, priv->ocr | OCR_MODE_NORMAL);
+       priv->write_reg(priv, SJA1000_OCR, priv->ocr | OCR_MODE_NORMAL);
 }
 
 /*
@@ -289,21 +290,21 @@ static netdev_tx_t sja1000_start_xmit(struct sk_buff *skb,
        id = cf->can_id;
 
        if (id & CAN_RTR_FLAG)
-               fi |= FI_RTR;
+               fi |= SJA1000_FI_RTR;
 
        if (id & CAN_EFF_FLAG) {
-               fi |= FI_FF;
-               dreg = EFF_BUF;
-               priv->write_reg(priv, REG_FI, fi);
-               priv->write_reg(priv, REG_ID1, (id & 0x1fe00000) >> (5 + 16));
-               priv->write_reg(priv, REG_ID2, (id & 0x001fe000) >> (5 + 8));
-               priv->write_reg(priv, REG_ID3, (id & 0x00001fe0) >> 5);
-               priv->write_reg(priv, REG_ID4, (id & 0x0000001f) << 3);
+               fi |= SJA1000_FI_FF;
+               dreg = SJA1000_EFF_BUF;
+               priv->write_reg(priv, SJA1000_FI, fi);
+               priv->write_reg(priv, SJA1000_ID1, (id & 0x1fe00000) >> 21);
+               priv->write_reg(priv, SJA1000_ID2, (id & 0x001fe000) >> 13);
+               priv->write_reg(priv, SJA1000_ID3, (id & 0x00001fe0) >> 5);
+               priv->write_reg(priv, SJA1000_ID4, (id & 0x0000001f) << 3);
        } else {
-               dreg = SFF_BUF;
-               priv->write_reg(priv, REG_FI, fi);
-               priv->write_reg(priv, REG_ID1, (id & 0x000007f8) >> 3);
-               priv->write_reg(priv, REG_ID2, (id & 0x00000007) << 5);
+               dreg = SJA1000_SFF_BUF;
+               priv->write_reg(priv, SJA1000_FI, fi);
+               priv->write_reg(priv, SJA1000_ID1, (id & 0x000007f8) >> 3);
+               priv->write_reg(priv, SJA1000_ID2, (id & 0x00000007) << 5);
        }
 
        for (i = 0; i < dlc; i++)
@@ -335,25 +336,25 @@ static void sja1000_rx(struct net_device *dev)
        if (skb == NULL)
                return;
 
-       fi = priv->read_reg(priv, REG_FI);
+       fi = priv->read_reg(priv, SJA1000_FI);
 
-       if (fi & FI_FF) {
+       if (fi & SJA1000_FI_FF) {
                /* extended frame format (EFF) */
-               dreg = EFF_BUF;
-               id = (priv->read_reg(priv, REG_ID1) << (5 + 16))
-                   | (priv->read_reg(priv, REG_ID2) << (5 + 8))
-                   | (priv->read_reg(priv, REG_ID3) << 5)
-                   | (priv->read_reg(priv, REG_ID4) >> 3);
+               dreg = SJA1000_EFF_BUF;
+               id = (priv->read_reg(priv, SJA1000_ID1) << 21)
+                   | (priv->read_reg(priv, SJA1000_ID2) << 13)
+                   | (priv->read_reg(priv, SJA1000_ID3) << 5)
+                   | (priv->read_reg(priv, SJA1000_ID4) >> 3);
                id |= CAN_EFF_FLAG;
        } else {
                /* standard frame format (SFF) */
-               dreg = SFF_BUF;
-               id = (priv->read_reg(priv, REG_ID1) << 3)
-                   | (priv->read_reg(priv, REG_ID2) >> 5);
+               dreg = SJA1000_SFF_BUF;
+               id = (priv->read_reg(priv, SJA1000_ID1) << 3)
+                   | (priv->read_reg(priv, SJA1000_ID2) >> 5);
        }
 
        cf->can_dlc = get_can_dlc(fi & 0x0F);
-       if (fi & FI_RTR) {
+       if (fi & SJA1000_FI_RTR) {
                id |= CAN_RTR_FLAG;
        } else {
                for (i = 0; i < cf->can_dlc; i++)
@@ -414,7 +415,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
                priv->can.can_stats.bus_error++;
                stats->rx_errors++;
 
-               ecc = priv->read_reg(priv, REG_ECC);
+               ecc = priv->read_reg(priv, SJA1000_ECC);
 
                cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
 
@@ -448,7 +449,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
        if (isrc & IRQ_ALI) {
                /* arbitration lost interrupt */
                netdev_dbg(dev, "arbitration lost interrupt\n");
-               alc = priv->read_reg(priv, REG_ALC);
+               alc = priv->read_reg(priv, SJA1000_ALC);
                priv->can.can_stats.arbitration_lost++;
                stats->tx_errors++;
                cf->can_id |= CAN_ERR_LOSTARB;
@@ -457,8 +458,8 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
 
        if (state != priv->can.state && (state == CAN_STATE_ERROR_WARNING ||
                                         state == CAN_STATE_ERROR_PASSIVE)) {
-               uint8_t rxerr = priv->read_reg(priv, REG_RXERR);
-               uint8_t txerr = priv->read_reg(priv, REG_TXERR);
+               uint8_t rxerr = priv->read_reg(priv, SJA1000_RXERR);
+               uint8_t txerr = priv->read_reg(priv, SJA1000_TXERR);
                cf->can_id |= CAN_ERR_CRTL;
                if (state == CAN_STATE_ERROR_WARNING) {
                        priv->can.can_stats.error_warning++;
@@ -494,15 +495,16 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
        int n = 0;
 
        /* Shared interrupts and IRQ off? */
-       if (priv->read_reg(priv, REG_IER) == IRQ_OFF)
+       if (priv->read_reg(priv, SJA1000_IER) == IRQ_OFF)
                return IRQ_NONE;
 
        if (priv->pre_irq)
                priv->pre_irq(priv);
 
-       while ((isrc = priv->read_reg(priv, REG_IR)) && (n < SJA1000_MAX_IRQ)) {
+       while ((isrc = priv->read_reg(priv, SJA1000_IR)) &&
+              (n < SJA1000_MAX_IRQ)) {
                n++;
-               status = priv->read_reg(priv, SJA1000_REG_SR);
+               status = priv->read_reg(priv, SJA1000_SR);
                /* check for absent controller due to hw unplug */
                if (status == 0xFF && sja1000_is_absent(priv))
                        return IRQ_NONE;
@@ -519,7 +521,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
                        } else {
                                /* transmission complete */
                                stats->tx_bytes +=
-                                       priv->read_reg(priv, REG_FI) & 0xf;
+                                       priv->read_reg(priv, SJA1000_FI) & 0xf;
                                stats->tx_packets++;
                                can_get_echo_skb(dev, 0);
                        }
@@ -530,7 +532,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
                        /* receive interrupt */
                        while (status & SR_RBS) {
                                sja1000_rx(dev);
-                               status = priv->read_reg(priv, SJA1000_REG_SR);
+                               status = priv->read_reg(priv, SJA1000_SR);
                                /* check for absent controller */
                                if (status == 0xFF && sja1000_is_absent(priv))
                                        return IRQ_NONE;