patch-2.3.50 linux/drivers/char/ppdev.c

• Lines: 45
• Date: Tue Mar 7 11:04:12 2000
• Orig file: v2.3.49/linux/drivers/char/ppdev.c
• Orig date: Sun Feb 20 21:12:39 2000

diff -u --recursive --new-file v2.3.49/linux/drivers/char/ppdev.c linux/drivers/char/ppdev.c
@@ -83,7 +83,7 @@
 /* ROUND_UP macro from fs/select.c */
 #define ROUND_UP(x,y) (((x)+(y)-1)/(y))
 
-static inline void enable_irq (struct pp_struct *pp)
+static inline void pp_enable_irq (struct pp_struct *pp)
 {
 	struct parport *port = pp->pdev->port;
 	port->ops->enable_irq (port);
@@ -144,7 +144,7 @@
 	}
 
 	kfree (kbuffer);
-	enable_irq (pp);
+	pp_enable_irq (pp);
 	return bytes_read;
 }
 
@@ -197,7 +197,7 @@
 	}
 
 	kfree (kbuffer);
-	enable_irq (pp);
+	pp_enable_irq (pp);
 	return bytes_written;
 }
 
@@ -292,7 +292,7 @@
 
 		/* For interrupt-reporting to work, we need to be
 		 * informed of each interrupt. */
-		enable_irq (pp);
+		pp_enable_irq (pp);
 
 		/* We may need to fix up the state machine. */
 		info = &pp->pdev->port->ieee1284;
@@ -441,7 +441,7 @@
 			ret = -ENXIO;
 			break;
 		}
-		enable_irq (pp);
+		pp_enable_irq (pp);
 		return ret;
 
 	case PPWCTLONIRQ: