diff options
author | Borislav Petkov <petkovbb@googlemail.com> | 2008-04-27 09:38:27 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-27 09:38:27 -0400 |
commit | ea1ab3d3319b399e2b707c270d2d6077b61183f6 (patch) | |
tree | 81465d2e469ee1b2340823eb5e6ce1fd6d99118e /drivers/ide/ide-tape.c | |
parent | 189bb3b345f59b11484b43f2717a66824acdc548 (diff) |
ide-tape: unwrap idetape_queue_pc_tail()
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>
Diffstat (limited to 'drivers/ide/ide-tape.c')
-rw-r--r-- | drivers/ide/ide-tape.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index d907abaed909..ad7e532cbe60 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -1636,7 +1636,7 @@ static void idetape_create_test_unit_ready_cmd(struct ide_atapi_pc *pc) | |||
1636 | * to the request list without waiting for it to be serviced! In that case, we | 1636 | * to the request list without waiting for it to be serviced! In that case, we |
1637 | * usually use idetape_queue_pc_head(). | 1637 | * usually use idetape_queue_pc_head(). |
1638 | */ | 1638 | */ |
1639 | static int __idetape_queue_pc_tail(ide_drive_t *drive, struct ide_atapi_pc *pc) | 1639 | static int idetape_queue_pc_tail(ide_drive_t *drive, struct ide_atapi_pc *pc) |
1640 | { | 1640 | { |
1641 | struct ide_tape_obj *tape = drive->driver_data; | 1641 | struct ide_tape_obj *tape = drive->driver_data; |
1642 | struct request rq; | 1642 | struct request rq; |
@@ -1668,7 +1668,7 @@ static int idetape_wait_ready(ide_drive_t *drive, unsigned long timeout) | |||
1668 | timeout += jiffies; | 1668 | timeout += jiffies; |
1669 | while (time_before(jiffies, timeout)) { | 1669 | while (time_before(jiffies, timeout)) { |
1670 | idetape_create_test_unit_ready_cmd(&pc); | 1670 | idetape_create_test_unit_ready_cmd(&pc); |
1671 | if (!__idetape_queue_pc_tail(drive, &pc)) | 1671 | if (!idetape_queue_pc_tail(drive, &pc)) |
1672 | return 0; | 1672 | return 0; |
1673 | if ((tape->sense_key == 2 && tape->asc == 4 && tape->ascq == 2) | 1673 | if ((tape->sense_key == 2 && tape->asc == 4 && tape->ascq == 2) |
1674 | || (tape->asc == 0x3A)) { | 1674 | || (tape->asc == 0x3A)) { |
@@ -1677,7 +1677,7 @@ static int idetape_wait_ready(ide_drive_t *drive, unsigned long timeout) | |||
1677 | return -ENOMEDIUM; | 1677 | return -ENOMEDIUM; |
1678 | idetape_create_load_unload_cmd(drive, &pc, | 1678 | idetape_create_load_unload_cmd(drive, &pc, |
1679 | IDETAPE_LU_LOAD_MASK); | 1679 | IDETAPE_LU_LOAD_MASK); |
1680 | __idetape_queue_pc_tail(drive, &pc); | 1680 | idetape_queue_pc_tail(drive, &pc); |
1681 | load_attempted = 1; | 1681 | load_attempted = 1; |
1682 | /* not about to be ready */ | 1682 | /* not about to be ready */ |
1683 | } else if (!(tape->sense_key == 2 && tape->asc == 4 && | 1683 | } 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) | |||
1688 | return -EIO; | 1688 | return -EIO; |
1689 | } | 1689 | } |
1690 | 1690 | ||
1691 | static int idetape_queue_pc_tail(ide_drive_t *drive, struct ide_atapi_pc *pc) | ||
1692 | { | ||
1693 | return __idetape_queue_pc_tail(drive, pc); | ||
1694 | } | ||
1695 | |||
1696 | static int idetape_flush_tape_buffers(ide_drive_t *drive) | 1691 | static int idetape_flush_tape_buffers(ide_drive_t *drive) |
1697 | { | 1692 | { |
1698 | struct ide_atapi_pc pc; | 1693 | struct ide_atapi_pc pc; |