From 87bbefa54068f9da64cf5137b7aff68dce6a9d06 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Wed, 10 Mar 2010 15:21:08 -0800
Subject: [PATCH] --- yaml --- r: 187151 b: refs/heads/master c:
 ce2f11fe784f7999b82c7a71cdbcb86ad2653def h: refs/heads/master i:   187149:
 c9a1f07a46a873ef7ecbec9e729fc0ca8749e124   187147:
 df6658894472559b9a11ce36d1b5e4904a32a492   187143:
 ea9d477a34785346dbb6429fc10544255e50d75c   187135:
 4abfb741a610b6be63cec9a76d5805bb8a9c8e21 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/block/floppy.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 29c6445c1071..da68172ec4b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ebddd85a6a6ad793eca82d65fba4573d0e28042
+refs/heads/master: ce2f11fe784f7999b82c7a71cdbcb86ad2653def
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 46536b716acc..4807203827cc 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/drivers/block/floppy.c
@@ -3104,13 +3104,13 @@ static struct cont_t raw_cmd_cont = {
 	.done		= raw_cmd_done
 };
 
-static inline int raw_cmd_copyout(int cmd, char __user *param,
+static inline int raw_cmd_copyout(int cmd, void __user *param,
 				  struct floppy_raw_cmd *ptr)
 {
 	int ret;
 
 	while (ptr) {
-		ret = copy_to_user((void __user *)param, ptr, sizeof(*ptr));
+		ret = copy_to_user(param, ptr, sizeof(*ptr));
 		if (ret)
 			return -EFAULT;
 		param += sizeof(struct floppy_raw_cmd);
@@ -3148,7 +3148,7 @@ static void raw_cmd_free(struct floppy_raw_cmd **ptr)
 	}
 }
 
-static inline int raw_cmd_copyin(int cmd, char __user *param,
+static inline int raw_cmd_copyin(int cmd, void __user *param,
 				 struct floppy_raw_cmd **rcmd)
 {
 	struct floppy_raw_cmd *ptr;
@@ -3157,12 +3157,11 @@ static inline int raw_cmd_copyin(int cmd, char __user *param,
 
 	*rcmd = NULL;
 	while (1) {
-		ptr = (struct floppy_raw_cmd *)
-		    kmalloc(sizeof(struct floppy_raw_cmd), GFP_USER);
+		ptr = kmalloc(sizeof(struct floppy_raw_cmd), GFP_USER);
 		if (!ptr)
 			return -ENOMEM;
 		*rcmd = ptr;
-		ret = copy_from_user(ptr, (void __user *)param, sizeof(*ptr));
+		ret = copy_from_user(ptr, param, sizeof(*ptr));
 		if (ret)
 			return -EFAULT;
 		ptr->next = NULL;