aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/sja1000/ems_pci.c
diff options
context:
space:
mode:
authorOliver Hartkopp <socketcan@hartkopp.net>2013-04-13 21:35:49 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2013-04-16 12:39:14 +0200
commit06e1d1d71876c75bf4a9d3b310c1b4df34e8be69 (patch)
tree0f2a63b251e240c86500051d961a931f2b0752bc /drivers/net/can/sja1000/ems_pci.c
parent61f47132dcba1eacf8fd8e64488d0b6d4bcbe4a0 (diff)
downloadkernel_goldelico_gta04-06e1d1d71876c75bf4a9d3b310c1b4df34e8be69.zip
kernel_goldelico_gta04-06e1d1d71876c75bf4a9d3b310c1b4df34e8be69.tar.gz
kernel_goldelico_gta04-06e1d1d71876c75bf4a9d3b310c1b4df34e8be69.tar.bz2
can: sja1000: use common prefix for all sja1000 defines
This is a follow up patch to: f901b6b can: sja1000: fix define conflict on SH That patch fixed a define conflict between the SH architecture and the sja1000 driver, by addind a prefix to one macro only. This patch consistently renames the prefix of the SJA1000 controller registers from "REG_" to "SJA1000_". Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/sja1000/ems_pci.c')
-rw-r--r--drivers/net/can/sja1000/ems_pci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
index 36d298d..3752342 100644
--- a/drivers/net/can/sja1000/ems_pci.c
+++ b/drivers/net/can/sja1000/ems_pci.c
@@ -168,12 +168,12 @@ static inline int ems_pci_check_chan(const struct sja1000_priv *priv)
unsigned char res;
/* Make sure SJA1000 is in reset mode */
- priv->write_reg(priv, REG_MOD, 1);
+ priv->write_reg(priv, SJA1000_MOD, 1);
- priv->write_reg(priv, REG_CDR, CDR_PELICAN);
+ priv->write_reg(priv, SJA1000_CDR, CDR_PELICAN);
/* read reset-values */
- res = priv->read_reg(priv, REG_CDR);
+ res = priv->read_reg(priv, SJA1000_CDR);
if (res == CDR_PELICAN)
return 1;