arcnet: Add com9026.h to standardize COM9026_REG_<foo>

Deduplicate the COM9026 registers.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>

diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c
index 4c35a7eb7ddebdf170650094ccace209cfb54783..a07e24970be4216f16df473c80dab72b516ab11c 100644 (file)
--- a/drivers/net/arcnet/arc-rimi.c
+++ b/drivers/net/arcnet/arc-rimi.c
@@ -39,6 +39,7 @@
 #include <linux/io.h>
 
 #include "arcdevice.h"
+#include "com9026.h"
 
 /* Internal function declarations */
 
@@ -59,18 +60,6 @@ static void arcrimi_copy_from_card(struct net_device *dev, int bufnum,
 #define BUFFER_SIZE    (512)
 #define MIRROR_SIZE    (BUFFER_SIZE * 4)
 
-/* COM 9026 controller chip --> ARCnet register addresses */
-#define COM9026_REG_W_INTMASK  0       /* writable */
-#define COM9026_REG_R_STATUS   0       /* readable */
-#define COM9026_REG_W_COMMAND  1       /* writable, returns random vals on read (?) */
-#define COM9026_REG_RW_CONFIG  2       /* Configuration register */
-#define COM9026_REG_R_RESET    8       /* software reset (on read) */
-#define COM9026_REG_RW_MEMDATA 12      /* Data port for IO-mapped memory */
-#define COM9026_REG_W_ADDR_LO  14      /* Control registers for said */
-#define COM9026_REG_W_ADDR_HI  15
-
-#define COM9026_REG_R_STATION  1       /* Station ID */
-
 /* We cannot probe for a RIM I card; one reason is I don't know how to reset
  * them.  In fact, we can't even get their node ID automatically.  So, we
  * need to be passed a specific shmem address, IRQ, and node ID.

diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index bcfdd9123e4f0b35abc4b9139b3f84084bfe9596..2158e985a0e7b8cb37e31e28c1cdb5009a23e1ab 100644 (file)
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -53,6 +53,7 @@
 #include <linux/jiffies.h>
 
 #include "arcdevice.h"
+#include "com9026.h"
 
 /* "do nothing" functions for protocol drivers */
 static void null_rx(struct net_device *dev, int bufnum,

diff --git a/drivers/net/arcnet/com9026.h b/drivers/net/arcnet/com9026.h
new file mode 100644 (file)
index 0000000..efcaf67
--- /dev/null
+++ b/drivers/net/arcnet/com9026.h
@@ -0,0 +1,17 @@
+#ifndef __COM9026_H
+#define __COM9026_H
+
+/* COM 9026 controller chip --> ARCnet register addresses */
+
+#define COM9026_REG_W_INTMASK  0       /* writable */
+#define COM9026_REG_R_STATUS   0       /* readable */
+#define COM9026_REG_W_COMMAND  1       /* writable, returns random vals on read (?) */
+#define COM9026_REG_RW_CONFIG  2       /* Configuration register */
+#define COM9026_REG_R_RESET    8       /* software reset (on read) */
+#define COM9026_REG_RW_MEMDATA 12      /* Data port for IO-mapped memory */
+#define COM9026_REG_W_ADDR_LO  14      /* Control registers for said */
+#define COM9026_REG_W_ADDR_HI  15
+
+#define COM9026_REG_R_STATION  1       /* Station ID */
+
+#endif

diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c
index 7e084f148fa0933116dc6ae4d9a522480a02c756..b57863df5bf53e6ee0269b4d9f2055a06011b1d1 100644 (file)
--- a/drivers/net/arcnet/com90io.c
+++ b/drivers/net/arcnet/com90io.c
@@ -40,6 +40,7 @@
 #include <linux/io.h>
 
 #include "arcdevice.h"
+#include "com9026.h"
 
 /* Internal function declarations */
 
@@ -58,16 +59,6 @@ static void com90io_copy_from_card(struct net_device *dev, int bufnum,
 /* The number of low I/O ports used by the card. */
 #define ARCNET_TOTAL_SIZE 16
 
-/* COM 9026 controller chip --> ARCnet register addresses */
-#define COM9026_REG_W_INTMASK  0       /* writable */
-#define COM9026_REG_R_STATUS   0       /* readable */
-#define COM9026_REG_W_COMMAND  1       /* writable, returns random vals on read (?) */
-#define COM9026_REG_RW_CONFIG  2       /* Configuration register */
-#define COM9026_REG_R_RESET    8       /* software reset (on read) */
-#define COM9026_REG_RW_MEMDATA 12      /* Data port for IO-mapped memory */
-#define COM9026_REG_W_ADDR_LO  14      /* Control registers for said */
-#define COM9026_REG_W_ADDR_HI  15
-
 /****************************************************************************
  *                                                                          *
  * IO-mapped operation routines                                             *

diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c
index a97d086a8f51118adab22a4e8133147264af0c94..0d9b45ff1bb21bc7878c251c63082a5400a7d93b 100644 (file)
--- a/drivers/net/arcnet/com90xx.c
+++ b/drivers/net/arcnet/com90xx.c
@@ -38,6 +38,7 @@
 #include <linux/io.h>
 
 #include "arcdevice.h"
+#include "com9026.h"
 
 /* Define this to speed up the autoprobe by assuming if only one io port and
  * shmem are left in the list at Stage 5, they must correspond to each
@@ -78,18 +79,6 @@ static int numcards;
 #define BUFFER_SIZE (512)
 #define MIRROR_SIZE (BUFFER_SIZE * 4)
 
-/* COM 9026 controller chip --> ARCnet register addresses */
-#define COM9026_REG_W_INTMASK  0       /* writable */
-#define COM9026_REG_R_STATUS   0       /* readable */
-#define COM9026_REG_W_COMMAND  1       /* writable, returns random vals on read (?) */
-#define COM9026_REG_RW_CONFIG  2       /* Configuration register */
-#define COM9026_REG_R_RESET    8       /* software reset (on read) */
-#define COM9026_REG_RW_MEMDATA 12      /* Data port for IO-mapped memory */
-#define COM9026_REG_W_ADDR_LO  14      /* Control registers for said */
-#define COM9026_REG_W_ADDR_HI  15
-
-#define COM9026_REG_R_STATION  1       /* Station ID */
-
 static int com90xx_skip_probe __initdata = 0;
 
 /* Module parameters */