renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code

ide-tape: unwrap idetape_queue_pc_tail()

Browse Source 
idetape_queue_pc_tail() is a wrapper for its __idetape_queue_pc_tail() counterpart
and has no other functionality. Remove it and call the "wrapped" function
directly.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Borislav Petkov 2008-04-27 15:38:27 +02:00 committed by Bartlomiej Zolnierkiewicz
parent 189bb3b345
commit ea1ab3d331
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/ide/ide-tape.c
View File

@ -1636,7 +1636,7 @@ static void idetape_create_test_unit_ready_cmd(struct ide_atapi_pc *pc)
* to the request list without waiting for it to be serviced! In that case, we * to the request list without waiting for it to be serviced! In that case, we
* usually use idetape_queue_pc_head(). * usually use idetape_queue_pc_head().
*/ */
static int __idetape_queue_pc_tail(ide_drive_t *drive, struct ide_atapi_pc *pc) static int idetape_queue_pc_tail(ide_drive_t *drive, struct ide_atapi_pc *pc)
{ {
struct ide_tape_obj *tape = drive->driver_data; struct ide_tape_obj *tape = drive->driver_data;
struct request rq; struct request rq;
@ -1668,7 +1668,7 @@ static int idetape_wait_ready(ide_drive_t *drive, unsigned long timeout)
timeout += jiffies; timeout += jiffies;
while (time_before(jiffies, timeout)) { while (time_before(jiffies, timeout)) {
idetape_create_test_unit_ready_cmd(&pc); idetape_create_test_unit_ready_cmd(&pc);
if (!__idetape_queue_pc_tail(drive, &pc)) if (!idetape_queue_pc_tail(drive, &pc))
return 0; return 0;
if ((tape->sense_key == 2 && tape->asc == 4 && tape->ascq == 2) if ((tape->sense_key == 2 && tape->asc == 4 && tape->ascq == 2)
|| (tape->asc == 0x3A)) { || (tape->asc == 0x3A)) {
@ -1677,7 +1677,7 @@ static int idetape_wait_ready(ide_drive_t *drive, unsigned long timeout)
return -ENOMEDIUM; return -ENOMEDIUM;
idetape_create_load_unload_cmd(drive, &pc, idetape_create_load_unload_cmd(drive, &pc,
IDETAPE_LU_LOAD_MASK); IDETAPE_LU_LOAD_MASK);
__idetape_queue_pc_tail(drive, &pc); idetape_queue_pc_tail(drive, &pc);
load_attempted = 1; load_attempted = 1;
/* not about to be ready */ /* not about to be ready */
} else if (!(tape->sense_key == 2 && tape->asc == 4 && } else if (!(tape->sense_key == 2 && tape->asc == 4 &&
@ -1688,11 +1688,6 @@ static int idetape_wait_ready(ide_drive_t *drive, unsigned long timeout)
return -EIO; return -EIO;
} }
static int idetape_queue_pc_tail(ide_drive_t *drive, struct ide_atapi_pc *pc)
{
return __idetape_queue_pc_tail(drive, pc);
}
static int idetape_flush_tape_buffers(ide_drive_t *drive) static int idetape_flush_tape_buffers(ide_drive_t *drive)
{ {
struct ide_atapi_pc pc; struct ide_atapi_pc pc;