lkml.org 
[lkml]   [2008]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 17/24] ide-tape: remove pipeline-specific code from idetape_chrdev_open
    Date
    From
    As a result, remove orphaned idetape_restart_speed_control. Also, unnest
    if-condition in idetape_chrdev_open.

    Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
    ---
    drivers/ide/ide-tape.c | 38 ++++++--------------------------------
    1 files changed, 6 insertions(+), 32 deletions(-)

    diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
    index cfc11bb..5f57bdb 100644
    --- a/drivers/ide/ide-tape.c
    +++ b/drivers/ide/ide-tape.c
    @@ -424,7 +424,6 @@ typedef struct ide_tape_obj {
    int uncontrolled_previous_pipeline_head;
    unsigned long controlled_previous_head_time;
    unsigned long uncontrolled_previous_head_time;
    - int restart_speed_control_req;

    u32 debug_mask;
    } idetape_tape_t;
    @@ -1838,24 +1837,6 @@ static int idetape_add_chrdev_write_request(ide_drive_t *drive, int blocks)
    tape->merge_stage->bh);
    }

    -static void idetape_restart_speed_control(ide_drive_t *drive)
    -{
    - idetape_tape_t *tape = drive->driver_data;
    -
    - tape->restart_speed_control_req = 0;
    - tape->pipeline_head = 0;
    - tape->controlled_last_pipeline_head = 0;
    - tape->controlled_previous_pipeline_head = 0;
    - tape->uncontrolled_previous_pipeline_head = 0;
    - tape->controlled_pipeline_head_speed = 5000;
    - tape->pipeline_head_speed = 5000;
    - tape->uncontrolled_pipeline_head_speed = 0;
    - tape->controlled_pipeline_head_time =
    - tape->uncontrolled_pipeline_head_time = jiffies;
    - tape->controlled_previous_head_time =
    - tape->uncontrolled_previous_head_time = jiffies;
    -}
    -
    static int idetape_init_read(ide_drive_t *drive)
    {
    idetape_tape_t *tape = drive->driver_data;
    @@ -2470,9 +2451,6 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
    if (!test_bit(IDETAPE_FLAG_ADDRESS_VALID, &tape->flags))
    (void)idetape_rewind_tape(drive);

    - if (tape->chrdev_dir != IDETAPE_DIR_READ)
    - clear_bit(IDETAPE_FLAG_PIPELINE_ERR, &tape->flags);
    -
    /* Read block size and write protect status from drive. */
    ide_tape_get_bsize_from_bdesc(drive);

    @@ -2493,16 +2471,12 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
    }

    /* Lock the tape drive door so user can't eject. */
    - if (tape->chrdev_dir == IDETAPE_DIR_NONE) {
    - if (idetape_create_prevent_cmd(drive, &pc, 1)) {
    - if (!idetape_queue_pc_tail(drive, &pc)) {
    - if (tape->door_locked != DOOR_EXPLICITLY_LOCKED)
    - tape->door_locked = DOOR_LOCKED;
    - }
    - }
    - }
    - idetape_restart_speed_control(drive);
    - tape->restart_speed_control_req = 0;
    + if (tape->chrdev_dir == IDETAPE_DIR_NONE &&
    + idetape_create_prevent_cmd(drive, &pc, 1) &&
    + !idetape_queue_pc_tail(drive, &pc) &&
    + tape->door_locked != DOOR_EXPLICITLY_LOCKED)
    + tape->door_locked = DOOR_LOCKED;
    +
    return 0;

    out_put_tape:
    --
    1.5.4.1


    \
     
     \ /
      Last update: 2008-03-01 10:09    [W:0.034 / U:32.476 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site