Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / can / sja1000 / plx_pci.c

diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
index 3c18d7d000edaabe3b8ec93f1d2841d3300df087..c52c1e96bf90741455eea01add4129fcfc590bad 100644 (file)
--- a/drivers/net/can/sja1000/plx_pci.c
+++ b/drivers/net/can/sja1000/plx_pci.c
@@ -348,20 +348,20 @@ static inline int plx_pci_check_sja1000(const struct sja1000_priv *priv)
         */
        if ((priv->read_reg(priv, REG_CR) & REG_CR_BASICCAN_INITIAL_MASK) ==
            REG_CR_BASICCAN_INITIAL &&
-           (priv->read_reg(priv, SJA1000_REG_SR) == REG_SR_BASICCAN_INITIAL) &&
-           (priv->read_reg(priv, REG_IR) == REG_IR_BASICCAN_INITIAL))
+           (priv->read_reg(priv, SJA1000_SR) == REG_SR_BASICCAN_INITIAL) &&
+           (priv->read_reg(priv, SJA1000_IR) == REG_IR_BASICCAN_INITIAL))
                flag = 1;
 
        /* Bring the SJA1000 into the PeliCAN mode*/
-       priv->write_reg(priv, REG_CDR, CDR_PELICAN);
+       priv->write_reg(priv, SJA1000_CDR, CDR_PELICAN);
 
        /*
         * Check registers after reset in the PeliCAN mode.
         * See states on p. 23 of the Datasheet.
         */
-       if (priv->read_reg(priv, REG_MOD) == REG_MOD_PELICAN_INITIAL &&
-           priv->read_reg(priv, SJA1000_REG_SR) == REG_SR_PELICAN_INITIAL &&
-           priv->read_reg(priv, REG_IR) == REG_IR_PELICAN_INITIAL)
+       if (priv->read_reg(priv, SJA1000_MOD) == REG_MOD_PELICAN_INITIAL &&
+           priv->read_reg(priv, SJA1000_SR) == REG_SR_PELICAN_INITIAL &&
+           priv->read_reg(priv, SJA1000_IR) == REG_IR_PELICAN_INITIAL)
                return flag;
 
        return 0;