Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8646c88f authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-tape: remove unused parameter from idetape_copy_stage_from_user 



Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 99d74e61

drivers/ide/ide-tape.c

+4 −7
Original line number Diff line number Diff line
@@ -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;

	}