lkml.org 
[lkml]   [2008]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 18/40] ide-tape: make pc->idetape_callback void
    There should be no functional changes caused by this patch.

    Cc: Borislav Petkov <petkovbb@gmail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/ide/ide-tape.c | 13 +++++++------
    include/linux/ide.h | 2 +-
    2 files changed, 8 insertions(+), 7 deletions(-)

    Index: b/drivers/ide/ide-tape.c
    ===================================================================
    --- a/drivers/ide/ide-tape.c
    +++ b/drivers/ide/ide-tape.c
    @@ -619,7 +619,7 @@ static int idetape_end_request(ide_drive
    return 0;
    }

    -static ide_startstop_t ide_tape_callback(ide_drive_t *drive)
    +static void ide_tape_callback(ide_drive_t *drive)
    {
    idetape_tape_t *tape = drive->driver_data;
    struct ide_atapi_pc *pc = tape->pc;
    @@ -675,8 +675,6 @@ static ide_startstop_t ide_tape_callback
    }

    idetape_end_request(drive, uptodate, 0);
    -
    - return ide_stopped;
    }

    static void idetape_init_pc(struct ide_atapi_pc *pc)
    @@ -843,7 +841,8 @@ static ide_startstop_t idetape_pc_intr(i
    if (tape->failed_pc == pc)
    tape->failed_pc = NULL;
    /* Command finished - Call the callback function */
    - return pc->idetape_callback(drive);
    + pc->idetape_callback(drive);
    + return ide_stopped;
    }

    if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) {
    @@ -1035,7 +1034,8 @@ static ide_startstop_t idetape_issue_pc(
    pc->error = IDETAPE_ERROR_GENERAL;
    }
    tape->failed_pc = NULL;
    - return pc->idetape_callback(drive);
    + pc->idetape_callback(drive);
    + return ide_stopped;
    }
    debug_log(DBG_SENSE, "Retry #%d, cmd = %02X\n", pc->retries, pc->c[0]);

    @@ -1120,7 +1120,8 @@ static ide_startstop_t idetape_media_acc
    pc->error = IDETAPE_ERROR_GENERAL;
    tape->failed_pc = NULL;
    }
    - return pc->idetape_callback(drive);
    + pc->idetape_callback(drive);
    + return ide_stopped;
    }

    static void idetape_create_read_cmd(idetape_tape_t *tape,
    Index: b/include/linux/ide.h
    ===================================================================
    --- a/include/linux/ide.h
    +++ b/include/linux/ide.h
    @@ -626,7 +626,7 @@ struct ide_atapi_pc {
    */
    u8 pc_buf[256];
    void (*idefloppy_callback) (ide_drive_t *);
    - ide_startstop_t (*idetape_callback) (ide_drive_t *);
    + void (*idetape_callback) (ide_drive_t *);

    /* idetape only */
    struct idetape_bh *bh;

    \
     
     \ /
      Last update: 2008-05-18 20:47    [W:0.039 / U:121.372 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site