X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fblock%2Fcarmel.c;h=38fd6fe42d07c74eb9ce8697b7b2d06223dacbe7;hb=4e76c8a9fa413ccc09d3f7f664183dcce3555d57;hp=81819216df9f5c5521bc1919767b3bb094d53432;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/drivers/block/carmel.c b/drivers/block/carmel.c
index 81819216d..38fd6fe42 100644
--- a/drivers/block/carmel.c
+++ b/drivers/block/carmel.c
@@ -413,7 +413,7 @@ static unsigned long carm_major_alloc;
 static int carm_bdev_ioctl(struct inode *ino, struct file *fil,
 			   unsigned int cmd, unsigned long arg)
 {
-	void __user *usermem = (void *) arg;
+	void __user *usermem = (void __user *) arg;
 	struct carm_port *port = ino->i_bdev->bd_disk->private_data;
 	struct hd_geometry geom;
 
@@ -438,17 +438,6 @@ static int carm_bdev_ioctl(struct inode *ino, struct file *fil,
 	return -EOPNOTSUPP;
 }
 
-static inline unsigned long msecs_to_jiffies(unsigned long msecs)
-{
-	return ((HZ * msecs + 999) / 1000);
-}
-
-static void msleep(unsigned long msecs)
-{
-	set_current_state(TASK_UNINTERRUPTIBLE);
-	schedule_timeout(msecs_to_jiffies(msecs));
-}
-
 static const u32 msg_sizes[] = { 32, 64, 128, CARM_MSG_SIZE };
 
 static inline int carm_lookup_bucket(u32 msg_size)