patch-2.3.14 linux/drivers/parport/parport_pc.c

• Lines: 37
• Date: Thu Aug 12 11:53:22 1999
• Orig file: v2.3.13/linux/drivers/parport/parport_pc.c
• Orig date: Mon Aug 9 14:59:22 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/parport/parport_pc.c linux/drivers/parport/parport_pc.c
@@ -76,7 +76,7 @@
 	outb ((inb (ECONTROL (pb)) & ~m) ^ v, ECONTROL (pb));
 }
 
-#if defined(CONFIG_PARPORT_1284) || defined(CONFIG_PARPORT_PC_FIFO)
+#ifdef CONFIG_PARPORT_PC_FIFO
 /* Safely change the mode bits in the ECR */
 static int change_mode(struct parport *p, int m)
 {
@@ -134,6 +134,7 @@
 	return 0;
 }
 
+#ifdef CONFIG_PARPORT_1284
 /* Find FIFO lossage; FIFO is reset */
 static int get_fifo_residue (struct parport *p)
 {
@@ -180,8 +181,8 @@
 
 	return residue;
 }
-
-#endif /* IEEE 1284 support or FIFO support */
+#endif /* IEEE 1284 support */
+#endif /* FIFO support */
 
 /*
  * Clear TIMEOUT BIT in EPP MODE
@@ -1879,7 +1880,7 @@
 			if (p->irq != PARPORT_IRQ_NONE)
 				free_irq(p->irq, p);
 			release_region(p->base, 3);
-			if (p->size > 3);
+			if (p->size > 3)
 				release_region(p->base + 3, p->size - 3);
 			if (p->modes & PARPORT_MODE_ECP)
 				release_region(p->base_hi, 3);