]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
ide-tape: remove unused parameter from idetape_copy_stage_from_user
authorBorislav Petkov <petkovbb@googlemail.com>
Sun, 27 Apr 2008 13:38:26 +0000 (15:38 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sun, 27 Apr 2008 13:38:26 +0000 (15:38 +0200)
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-tape.c

index b258444511a735bc9fca3d583ac4fdea82934eab..de70cb7789f25f4f4a7713685dbe3f77ed79e486 100644 (file)
@@ -1587,7 +1587,7 @@ abort:
 }
 
 static int idetape_copy_stage_from_user(idetape_tape_t *tape,
-               idetape_stage_t *stage, const char __user *buf, int n)
+                                       const char __user *buf, int n)
 {
        struct idetape_bh *bh = tape->bh;
        int count;
@@ -2588,8 +2588,7 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,
                actually_written = min((unsigned int)
                                (tape->stage_size - tape->merge_stage_size),
                                (unsigned int)count);
-               if (idetape_copy_stage_from_user(tape, tape->merge_stage, buf,
-                                                actually_written))
+               if (idetape_copy_stage_from_user(tape, buf, actually_written))
                                ret = -EFAULT;
                buf += actually_written;
                tape->merge_stage_size += actually_written;
@@ -2605,8 +2604,7 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,
        }
        while (count >= tape->stage_size) {
                ssize_t retval;
-               if (idetape_copy_stage_from_user(tape, tape->merge_stage, buf,
-                                                tape->stage_size))
+               if (idetape_copy_stage_from_user(tape, buf, tape->stage_size))
                        ret = -EFAULT;
                buf += tape->stage_size;
                count -= tape->stage_size;
@@ -2617,8 +2615,7 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,
        }
        if (count) {
                actually_written += count;
-               if (idetape_copy_stage_from_user(tape, tape->merge_stage, buf,
-                                                count))
+               if (idetape_copy_stage_from_user(tape, buf, count))
                        ret = -EFAULT;
                tape->merge_stage_size += count;
        }