X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fblock%2Fparide%2Fparide.c;h=4b258f7836f32f0b99b2f0607e3986a7bdebcbd1;hb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;hp=d95e4f8ec93ada02524a3100cdb695ae7041ac8d;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/drivers/block/paride/paride.c b/drivers/block/paride/paride.c
index d95e4f8ec..4b258f783 100644
--- a/drivers/block/paride/paride.c
+++ b/drivers/block/paride/paride.c
@@ -21,7 +21,6 @@
 #define PI_VERSION      "1.06"
 
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/kmod.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -29,6 +28,7 @@
 #include <linux/string.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
+#include <linux/sched.h>	/* TASK_* */
 
 #ifdef CONFIG_PARPORT_MODULE
 #define CONFIG_PARPORT
@@ -46,7 +46,7 @@ MODULE_LICENSE("GPL");
 
 static struct pi_protocol *protocols[MAX_PROTOS];
 
-static spinlock_t pi_spinlock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(pi_spinlock);
 
 void pi_write_regr(PIA * pi, int cont, int regr, int val)
 {
@@ -140,7 +140,7 @@ static void pi_claim(PIA * pi)
 #endif
 }
 
-void pi_unclaim(PIA * pi)
+static void pi_unclaim(PIA * pi)
 {
 	pi->claimed = 0;
 #ifdef CONFIG_PARPORT
@@ -149,8 +149,6 @@ void pi_unclaim(PIA * pi)
 #endif
 }
 
-EXPORT_SYMBOL(pi_unclaim);
-
 void pi_connect(PIA * pi)
 {
 	pi_claim(pi);
@@ -264,7 +262,7 @@ void pi_unregister(PIP * pr)
 		printk("paride: %s not registered\n", pr->name);
 		return;
 	}
-	protocols[pr->index] = 0;
+	protocols[pr->index] = NULL;
 }
 
 EXPORT_SYMBOL(pi_unregister);