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

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

diff -u --recursive --new-file v2.3.13/linux/drivers/net/a2065.c linux/drivers/net/a2065.c
@@ -169,7 +169,7 @@
 
 /* Setup the Lance Rx and Tx rings */
 /* Sets dev->tbusy */
-static void lance_init_ring (struct device *dev)
+static void lance_init_ring (struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_init_block *ib = lp->init_block;
@@ -270,7 +270,7 @@
 	return 0;
 }
 
-static int lance_rx (struct device *dev)
+static int lance_rx (struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_init_block *ib = lp->init_block;
@@ -345,7 +345,7 @@
 	return 0;
 }
 
-static int lance_tx (struct device *dev)
+static int lance_tx (struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_init_block *ib = lp->init_block;
@@ -430,12 +430,12 @@
 
 static void lance_interrupt (int irq, void *dev_id, struct pt_regs *regs)
 {
-	struct device *dev;
+	struct net_device *dev;
 	struct lance_private *lp;
 	volatile struct lance_regs *ll;
 	int csr0;
 
-	dev = (struct device *) dev_id;
+	dev = (struct net_device *) dev_id;
 
 	lp = (struct lance_private *) dev->priv;
 	ll = lp->ll;
@@ -488,9 +488,9 @@
 	dev->interrupt = 0;
 }
 
-struct device *last_dev = 0;
+struct net_device *last_dev = 0;
 
-static int lance_open (struct device *dev)
+static int lance_open (struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *)dev->priv;
 	volatile struct lance_regs *ll = lp->ll;
@@ -499,7 +499,7 @@
 	last_dev = dev;
 
 	/* Install the Interrupt handler */
-	if (request_irq(IRQ_AMIGA_PORTS, lance_interrupt, 0,
+	if (request_irq(IRQ_AMIGA_PORTS, lance_interrupt, SA_SHIRQ,
 			"a2065 Ethernet", dev))
 		return -EAGAIN;
 
@@ -521,7 +521,7 @@
 	return status;
 }
 
-static int lance_close (struct device *dev)
+static int lance_close (struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_regs *ll = lp->ll;
@@ -541,7 +541,7 @@
 	return 0;
 }
 
-static inline int lance_reset (struct device *dev)
+static inline int lance_reset (struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *)dev->priv;
 	volatile struct lance_regs *ll = lp->ll;
@@ -564,7 +564,7 @@
 	return status;
 }
 
-static int lance_start_xmit (struct sk_buff *skb, struct device *dev)
+static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *)dev->priv;
 	volatile struct lance_regs *ll = lp->ll;
@@ -644,7 +644,7 @@
 	return status;
 }
 
-static struct net_device_stats *lance_get_stats (struct device *dev)
+static struct net_device_stats *lance_get_stats (struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 
@@ -652,7 +652,7 @@
 }
 
 /* taken from the depca driver */
-static void lance_load_multicast (struct device *dev)
+static void lance_load_multicast (struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_init_block *ib = lp->init_block;
@@ -702,7 +702,7 @@
 	return;
 }
 
-static void lance_set_multicast (struct device *dev)
+static void lance_set_multicast (struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_init_block *ib = lp->init_block;
@@ -739,7 +739,7 @@
 	mark_bh(NET_BH);
 }
 
-int __init a2065_probe(struct device *dev)
+int __init a2065_probe(struct net_device *dev)
 {
 	unsigned int key, is_cbm;
 	const struct ConfigDev *cd;
@@ -821,7 +821,7 @@
 #ifdef MODULE
 static char devicename[9] = { 0, };
 
-static struct device a2065_dev =
+static struct net_device a2065_dev =
 {
 	devicename,			/* filled in by register_netdev() */
 	0, 0, 0, 0,			/* memory */