patch-2.3.14 linux/drivers/net/hplance.c

Next file: linux/drivers/net/hydra.c
Previous file: linux/drivers/net/hp100.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/drivers/net/hplance.c linux/drivers/net/hplance.c
@@ -54,10 +54,10 @@
  * plus board-specific init, open and close actions. 
  * Oh, and we need to tell the generic code how to read and write LANCE registers...
  */
-int hplance_probe(struct device *dev);
-static int hplance_init(struct device *dev, int scode);
-static int hplance_open(struct device *dev);
-static int hplance_close(struct device *dev);
+int hplance_probe(struct net_device *dev);
+static int hplance_init(struct net_device *dev, int scode);
+static int hplance_open(struct net_device *dev);
+static int hplance_close(struct net_device *dev);
 static void hplance_writerap(struct hplance_private *lp, unsigned short value);
 static void hplance_writerdp(struct hplance_private *lp, unsigned short value);
 static unsigned short hplance_readrdp(struct hplance_private *lp);
@@ -67,7 +67,7 @@
 #endif
 
 /* Find all the HP Lance boards and initialise them... */
-int __init hplance_probe(struct device *dev)
+int __init hplance_probe(struct net_device *dev)
 {
         int cards = 0, called = 0;
 
@@ -98,7 +98,7 @@
 }
 
 /* Initialise a single lance board at the given select code */
-static int __init hplance_init(struct device *dev, int scode)
+static int __init hplance_init(struct net_device *dev, int scode)
 {
         /* const char *name = dio_scodetoname(scode); */
         static const char name[] = "HP LANCE";
@@ -198,7 +198,7 @@
         return val;
 }
 
-static int hplance_open(struct device *dev)
+static int hplance_open(struct net_device *dev)
 {
         int status;
         struct hplance_private *lp = (struct hplance_private *)dev->priv;
@@ -214,7 +214,7 @@
         return 0;
 }
 
-static int hplance_close(struct device *dev)
+static int hplance_close(struct net_device *dev)
 {
         struct hplance_private *lp = (struct hplance_private *)dev->priv;
         struct hplance_reg *hpregs = (struct hplance_reg *)lp->base;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)