fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / block / paride / paride.h

diff --git a/drivers/block/paride/paride.h b/drivers/block/paride/paride.h
index 46bd0a4..2bddbf4 100644 (file)
--- a/drivers/block/paride/paride.h
+++ b/drivers/block/paride/paride.h
@@ -88,8 +88,6 @@ extern void pi_write_block(PIA *pi, char * buf, int count);
 
 extern void pi_read_block(PIA *pi, char * buf, int count);
 
-extern void pi_unclaim(PIA *pi);
-
 extern void pi_connect(PIA *pi);
 
 extern void pi_disconnect(PIA *pi);
@@ -99,7 +97,7 @@ extern int pi_schedule_claimed(PIA *pi, void (*cont)(void));
 
 /* macros and functions exported to the protocol modules */
 
-#define delay_p                        (pi->delay?udelay(pi->delay):0)
+#define delay_p                        (pi->delay?udelay(pi->delay):(void)0)
 #define out_p(offs,byte)       outb(byte,pi->port+offs); delay_p;
 #define in_p(offs)             (delay_p,inb(pi->port+offs))
 
@@ -165,8 +163,8 @@ struct pi_protocol {
 
 typedef struct pi_protocol PIP;
 
-extern int pi_register( PIP * );
-extern void pi_unregister ( PIP * );
+extern int paride_register( PIP * );
+extern void paride_unregister ( PIP * );
 
 #endif /* __DRIVERS_PARIDE_H__ */
 /* end of paride.h */