patch-2.1.48 linux/drivers/net/plip.c

• Lines: 62
• Date: Sun Aug 3 00:08:51 1997
• Orig file: v2.1.47/linux/drivers/net/plip.c
• Orig date: Tue May 13 22:41:09 1997

diff -u --recursive --new-file v2.1.47/linux/drivers/net/plip.c linux/drivers/net/plip.c
@@ -204,7 +204,7 @@
 	struct tq_struct deferred;
 	struct plip_local snd_data;
 	struct plip_local rcv_data;
-	struct ppd *pardev;
+	struct pardevice *pardev;
 	unsigned long  trigger;
 	unsigned long  nibble;
 	enum plip_connection_state connection;
@@ -228,7 +228,7 @@
 plip_init_dev(struct device *dev, struct parport *pb))
 {
 	struct net_local *nl;
-	struct ppd *pardev;
+	struct pardevice *pardev;
 
 	dev->irq = pb->irq;
 	dev->base_addr = pb->base;
@@ -239,8 +239,8 @@
 	}
 	
 	pardev = parport_register_device(pb, dev->name, plip_preempt,
-					plip_wakeup,
-					plip_interrupt, PARPORT_DEV_LURK, dev);
+					 plip_wakeup, plip_interrupt, 
+					 PARPORT_DEV_LURK, dev);
 
 	printk(version);
 	printk("%s: Parallel port at %#3lx, using IRQ %d\n", dev->name,
@@ -1045,7 +1045,7 @@
 	return 0;
 }
 
-static int
+static void
 plip_wakeup(void *handle)
 {
 	struct device *dev = (struct device *)handle;
@@ -1058,12 +1058,12 @@
 			/* bus_owner is already set (but why?) */
 			printk(KERN_DEBUG "%s: I'm broken.\n", dev->name);
 		else
-			return 1;
+			return;
 	}
 	
 	if (!(dev->flags & IFF_UP))
 		/* Don't need the port when the interface is down */
-		return 1;
+		return;
 
 	if (!parport_claim(nl->pardev)) {
 		nl->port_owner = 1;
@@ -1072,7 +1072,7 @@
 		outb (0x00, PAR_DATA(dev));
 	}
 
-	return 0;
+	return;
 }
 
 static struct net_device_stats *