lkml.org 
[lkml]   [2010]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/13] drivers/block/floppy.c: Remove some unnecessary casting
    Date
    Remove char/void __user * use
    Remove kmalloc cast

    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    drivers/block/floppy.c | 11 +++++------
    1 files changed, 5 insertions(+), 6 deletions(-)

    diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
    index 14fefe2..5bad295 100644
    --- a/drivers/block/floppy.c
    +++ b/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;
    --
    1.6.6.rc0.57.gad7a


    \
     
     \ /
      Last update: 2010-01-27 21:49    [W:0.022 / U:59.216 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site