patch-2.3.14 linux/drivers/net/arc-rimi.c

• Lines: 153
• Date: Wed Aug 18 11:36:41 1999
• Orig file: v2.3.13/linux/drivers/net/arc-rimi.c
• Orig date: Thu Jul 8 15:42:20 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/net/arc-rimi.c linux/drivers/net/arc-rimi.c
@@ -74,15 +74,15 @@
 
 /* Internal function declarations */
 
-static int arcrimi_probe(struct device *dev);
-static void arcrimi_rx(struct device *dev,int recbuf);
-static int arcrimi_found(struct device *dev,int ioaddr,int airq,u_long shmem);
-static void arcrimi_inthandler (struct device *dev);
-static int arcrimi_reset (struct device *dev, int reset_delay);
-static void arcrimi_setmask (struct device *dev, u_char mask);
-static void arcrimi_command (struct device *dev, u_char command);
-static u_char arcrimi_status (struct device *dev);
-static void arcrimi_prepare_tx(struct device *dev,u_char *hdr,int hdrlen,
+static int arcrimi_probe(struct net_device *dev);
+static void arcrimi_rx(struct net_device *dev,int recbuf);
+static int arcrimi_found(struct net_device *dev,int ioaddr,int airq,u_long shmem);
+static void arcrimi_inthandler (struct net_device *dev);
+static int arcrimi_reset (struct net_device *dev, int reset_delay);
+static void arcrimi_setmask (struct net_device *dev, u_char mask);
+static void arcrimi_command (struct net_device *dev, u_char command);
+static u_char arcrimi_status (struct net_device *dev);
+static void arcrimi_prepare_tx(struct net_device *dev,u_char *hdr,int hdrlen,
        	       char *data,int length,int daddr,int exceptA, int offset);
 static  void arcrimi_openclose(int open);
 
@@ -101,7 +101,7 @@
 MODULE_PARM (node, "i");
 #else
 void __init arcrimi_setup (char *str, int *ints);
-extern struct device arcnet_devs[];
+extern struct net_device arcnet_devs[];
 extern char arcnet_dev_names[][10];
 extern int arcnet_num_devs;
 #endif
@@ -140,7 +140,7 @@
  * 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.
  */
-int __init arcrimi_probe(struct device *dev)
+int __init arcrimi_probe(struct net_device *dev)
 {
   BUGLVL(D_NORMAL) printk(version);
   BUGMSG(D_NORMAL,"Given: node %02Xh, shmem %lXh, irq %d\n",
@@ -164,10 +164,10 @@
 }
 
 
-/* Set up the struct device associated with this card.  Called after
+/* Set up the struct net_device associated with this card.  Called after
  * probing succeeds.
  */
-int __init arcrimi_found(struct device *dev,int node,int airq, u_long shmem)
+int __init arcrimi_found(struct net_device *dev,int node,int airq, u_long shmem)
 {
   struct arcnet_local *lp;
   u_long first_mirror,last_mirror;
@@ -275,7 +275,7 @@
  *
  * However, it does make sure the card is in a defined state.
  */
-int arcrimi_reset(struct device *dev,int reset_delay)
+int arcrimi_reset(struct net_device *dev,int reset_delay)
 {
   struct arcnet_local *lp=(struct arcnet_local *)dev->priv;
   short ioaddr=dev->mem_start + 0x800;
@@ -333,21 +333,21 @@
     MOD_DEC_USE_COUNT;
 }
 
-static void arcrimi_setmask(struct device *dev, u_char mask)
+static void arcrimi_setmask(struct net_device *dev, u_char mask)
 {
   int ioaddr=dev->mem_start+0x800;
 
   AINTMASK(mask);
 }
 
-static u_char arcrimi_status(struct device *dev)
+static u_char arcrimi_status(struct net_device *dev)
 {
   int ioaddr=dev->mem_start+0x800;
 
   return ARCSTATUS;
 }
 
-static void arcrimi_command(struct device *dev, u_char cmd)
+static void arcrimi_command(struct net_device *dev, u_char cmd)
 {
   int ioaddr=dev->mem_start+0x800;
 
@@ -359,7 +359,7 @@
  * by the card.
  */
 static void
-arcrimi_inthandler(struct device *dev)
+arcrimi_inthandler(struct net_device *dev)
 {
   struct arcnet_local *lp=(struct arcnet_local *)dev->priv;
   int ioaddr=dev->mem_start+0x800, status, boguscount = 3, didsomething;
@@ -578,7 +578,7 @@
  */
 
 static void
-arcrimi_rx(struct device *dev,int recbuf)
+arcrimi_rx(struct net_device *dev,int recbuf)
 {
   struct arcnet_local *lp = (struct arcnet_local *)dev->priv;
   int ioaddr=dev->mem_start+0x800;
@@ -636,7 +636,7 @@
  * by arcnet_go_tx.
  */
 static void
-arcrimi_prepare_tx(struct device *dev,u_char *hdr,int hdrlen,
+arcrimi_prepare_tx(struct net_device *dev,u_char *hdr,int hdrlen,
 		   char *data,int length,int daddr,int exceptA, int offset)
 {
   struct arcnet_local *lp = (struct arcnet_local *)dev->priv;
@@ -734,7 +734,7 @@
 #ifdef MODULE
 
 static char devicename[9] = "";
-static struct device thiscard = {
+static struct net_device thiscard = {
   devicename, /* device name is inserted by linux/drivers/net/net_init.c */
   0, 0, 0, 0,
   0, 0,  /* I/O address, IRQ */
@@ -744,7 +744,7 @@
 
 int init_module(void)
 {
-  struct device *dev=&thiscard;
+  struct net_device *dev=&thiscard;
   if (device)
     strcpy(dev->name,device);
   else arcnet_makename(dev->name);
@@ -771,7 +771,7 @@
 
 void cleanup_module(void)
 {
-  struct device *dev=&thiscard;
+  struct net_device *dev=&thiscard;
   int ioaddr=dev->mem_start;
 
   if (dev->start) (*dev->stop)(dev);
@@ -799,7 +799,7 @@
 
 void __init arcrimi_setup (char *str, int *ints)
 {
-  struct device *dev;
+  struct net_device *dev;
 
   if (arcnet_num_devs == MAX_ARCNET_DEVS)
     {