lkml.org 
[lkml]   [2008]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 09/17] ide-tape: unwrap idetape_queue_pc_tail()
    Date
    From
    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>
    ---
    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 3eeb5c0..a85866a 100644
    --- a/drivers/ide/ide-tape.c
    +++ b/drivers/ide/ide-tape.c
    @@ -1631,7 +1631,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
    * 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 request rq;
    @@ -1663,7 +1663,7 @@ static int idetape_wait_ready(ide_drive_t *drive, unsigned long timeout)
    timeout += jiffies;
    while (time_before(jiffies, timeout)) {
    idetape_create_test_unit_ready_cmd(&pc);
    - if (!__idetape_queue_pc_tail(drive, &pc))
    + if (!idetape_queue_pc_tail(drive, &pc))
    return 0;
    if ((tape->sense_key == 2 && tape->asc == 4 && tape->ascq == 2)
    || (tape->asc == 0x3A)) {
    @@ -1672,7 +1672,7 @@ static int idetape_wait_ready(ide_drive_t *drive, unsigned long timeout)
    return -ENOMEDIUM;
    idetape_create_load_unload_cmd(drive, &pc,
    IDETAPE_LU_LOAD_MASK);
    - __idetape_queue_pc_tail(drive, &pc);
    + idetape_queue_pc_tail(drive, &pc);
    load_attempted = 1;
    /* not about to be ready */
    } else if (!(tape->sense_key == 2 && tape->asc == 4 &&
    @@ -1683,11 +1683,6 @@ static int idetape_wait_ready(ide_drive_t *drive, unsigned long timeout)
    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)
    {
    struct ide_atapi_pc pc;
    --
    1.5.4.1


    \
     
     \ /
      Last update: 2008-03-17 07:47    [W:0.024 / U:0.656 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site