X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fide%2Fide-floppy.c;h=1f8db9ac05d12def5a5fe8f49a7492e628e4a0bb;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=a53e3ce4a14211435965c00aca679d979deb5ad2;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index a53e3ce4a..1f8db9ac0 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -98,7 +98,6 @@
 #include <linux/cdrom.h>
 #include <linux/ide.h>
 #include <linux/bitops.h>
-#include <linux/mutex.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
@@ -518,7 +517,7 @@ typedef struct {
 	u8		reserved[4];
 } idefloppy_mode_parameter_header_t;
 
-static DEFINE_MUTEX(idefloppy_ref_mutex);
+static DECLARE_MUTEX(idefloppy_ref_sem);
 
 #define to_ide_floppy(obj) container_of(obj, struct ide_floppy_obj, kref)
 
@@ -529,11 +528,11 @@ static struct ide_floppy_obj *ide_floppy_get(struct gendisk *disk)
 {
 	struct ide_floppy_obj *floppy = NULL;
 
-	mutex_lock(&idefloppy_ref_mutex);
+	down(&idefloppy_ref_sem);
 	floppy = ide_floppy_g(disk);
 	if (floppy)
 		kref_get(&floppy->kref);
-	mutex_unlock(&idefloppy_ref_mutex);
+	up(&idefloppy_ref_sem);
 	return floppy;
 }
 
@@ -541,9 +540,9 @@ static void ide_floppy_release(struct kref *);
 
 static void ide_floppy_put(struct ide_floppy_obj *floppy)
 {
-	mutex_lock(&idefloppy_ref_mutex);
+	down(&idefloppy_ref_sem);
 	kref_put(&floppy->kref, ide_floppy_release);
-	mutex_unlock(&idefloppy_ref_mutex);
+	up(&idefloppy_ref_sem);
 }
 
 /*