mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 20:51:44 +00:00
ide-tape: make __idetape_discard_read_pipeline() of type void
It always returns 0 which has no effect on tape positioning calculation so simplify it by converting its type to void, bringing no functional change to the driver. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
fd0949e6e8
commit
9798630a75
@ -1641,12 +1641,12 @@ static int idetape_create_prevent_cmd(ide_drive_t *drive,
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int __idetape_discard_read_pipeline(ide_drive_t *drive)
|
||||
static void __idetape_discard_read_pipeline(ide_drive_t *drive)
|
||||
{
|
||||
idetape_tape_t *tape = drive->driver_data;
|
||||
|
||||
if (tape->chrdev_dir != IDETAPE_DIR_READ)
|
||||
return 0;
|
||||
return;
|
||||
|
||||
clear_bit(IDETAPE_FLAG_FILEMARK, &tape->flags);
|
||||
tape->merge_stage_size = 0;
|
||||
@ -1656,8 +1656,6 @@ static int __idetape_discard_read_pipeline(ide_drive_t *drive)
|
||||
}
|
||||
|
||||
tape->chrdev_dir = IDETAPE_DIR_NONE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -1689,13 +1687,12 @@ static void idetape_discard_read_pipeline(ide_drive_t *drive,
|
||||
int restore_position)
|
||||
{
|
||||
idetape_tape_t *tape = drive->driver_data;
|
||||
int cnt;
|
||||
int seek, position;
|
||||
|
||||
cnt = __idetape_discard_read_pipeline(drive);
|
||||
__idetape_discard_read_pipeline(drive);
|
||||
if (restore_position) {
|
||||
position = idetape_read_position(drive);
|
||||
seek = position > cnt ? position - cnt : 0;
|
||||
seek = position > 0 ? position : 0;
|
||||
if (idetape_position_tape(drive, seek, 0, 0)) {
|
||||
printk(KERN_INFO "ide-tape: %s: position_tape failed in"
|
||||
" discard_pipeline()\n", tape->name);
|
||||
|
Loading…
Reference in New Issue
Block a user