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

Commit 99d74e61 authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-tape: remove unused parameter from idetape_copy_stage_to_user 



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

drivers/ide/ide-tape.c

+4 −7
Original line number Diff line number Diff line
@@ -1619,7 +1619,7 @@ static int idetape_copy_stage_from_user(idetape_tape_t *tape, 
}



static int idetape_copy_stage_to_user(idetape_tape_t *tape, char __user *buf,

		idetape_stage_t *stage, int n)

				      int n)

{

	struct idetape_bh *bh = tape->bh;

	int count;
@@ -2493,8 +2493,7 @@ static ssize_t idetape_chrdev_read(struct file *file, char __user *buf, 
	if (tape->merge_stage_size) {

		actually_read = min((unsigned int)(tape->merge_stage_size),

				    (unsigned int)count);

		if (idetape_copy_stage_to_user(tape, buf, tape->merge_stage,

					       actually_read))

		if (idetape_copy_stage_to_user(tape, buf, actually_read))

			ret = -EFAULT;

		buf += actually_read;

		tape->merge_stage_size -= actually_read;
@@ -2504,8 +2503,7 @@ static ssize_t idetape_chrdev_read(struct file *file, char __user *buf, 
		bytes_read = idetape_add_chrdev_read_request(drive, ctl);

		if (bytes_read <= 0)

			goto finish;

		if (idetape_copy_stage_to_user(tape, buf, tape->merge_stage,

					       bytes_read))

		if (idetape_copy_stage_to_user(tape, buf, bytes_read))

			ret = -EFAULT;

		buf += bytes_read;

		count -= bytes_read;
@@ -2516,8 +2514,7 @@ static ssize_t idetape_chrdev_read(struct file *file, char __user *buf, 
		if (bytes_read <= 0)

			goto finish;

		temp = min((unsigned long)count, (unsigned long)bytes_read);

		if (idetape_copy_stage_to_user(tape, buf, tape->merge_stage,

					       temp))

		if (idetape_copy_stage_to_user(tape, buf, temp))

			ret = -EFAULT;

		actually_read += temp;

		tape->merge_stage_size = bytes_read-temp;