lkml.org 
[lkml]   [2008]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] IDE: Remove unused code
    Date
    Remove some code which has been made obsolete and hasn't worked properly
    before anyway.

    Signed-off-by: Elias Oltmanns <eo@nebensachen.de>
    ---

    drivers/ide/ide-cd.c | 1 -
    drivers/ide/ide-disk.c | 1 -
    drivers/ide/ide-floppy.c | 1 -
    drivers/ide/ide-io.c | 49 ----------------------------------------------
    drivers/ide/ide-tape.c | 1 -
    drivers/scsi/ide-scsi.c | 14 -------------
    include/linux/ide.h | 5 -----
    7 files changed, 0 insertions(+), 72 deletions(-)

    diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
    index b5ec249..26e8972 100644
    --- a/drivers/ide/ide-cd.c
    +++ b/drivers/ide/ide-cd.c
    @@ -1940,7 +1940,6 @@ static ide_driver_t ide_cdrom_driver = {
    .do_request = ide_cd_do_request,
    .end_request = ide_end_request,
    .error = __ide_error,
    - .abort = __ide_abort,
    #ifdef CONFIG_IDE_PROC_FS
    .proc = idecd_proc,
    #endif
    diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
    index 5f49a4a..3a2e802 100644
    --- a/drivers/ide/ide-disk.c
    +++ b/drivers/ide/ide-disk.c
    @@ -985,7 +985,6 @@ static ide_driver_t idedisk_driver = {
    .do_request = ide_do_rw_disk,
    .end_request = ide_end_request,
    .error = __ide_error,
    - .abort = __ide_abort,
    #ifdef CONFIG_IDE_PROC_FS
    .proc = idedisk_proc,
    #endif
    diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
    index c7e4433..011d720 100644
    --- a/drivers/ide/ide-floppy.c
    +++ b/drivers/ide/ide-floppy.c
    @@ -1129,7 +1129,6 @@ static ide_driver_t idefloppy_driver = {
    .do_request = idefloppy_do_request,
    .end_request = idefloppy_end_request,
    .error = __ide_error,
    - .abort = __ide_abort,
    #ifdef CONFIG_IDE_PROC_FS
    .proc = idefloppy_proc,
    #endif
    diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
    index d80f1b9..731f975 100644
    --- a/drivers/ide/ide-io.c
    +++ b/drivers/ide/ide-io.c
    @@ -504,55 +504,6 @@ ide_startstop_t ide_error (ide_drive_t *drive, const char *msg, u8 stat)

    EXPORT_SYMBOL_GPL(ide_error);

    -ide_startstop_t __ide_abort(ide_drive_t *drive, struct request *rq)
    -{
    - if (drive->media != ide_disk)
    - rq->errors |= ERROR_RESET;
    -
    - ide_kill_rq(drive, rq);
    -
    - return ide_stopped;
    -}
    -
    -EXPORT_SYMBOL_GPL(__ide_abort);
    -
    -/**
    - * ide_abort - abort pending IDE operations
    - * @drive: drive the error occurred on
    - * @msg: message to report
    - *
    - * ide_abort kills and cleans up when we are about to do a
    - * host initiated reset on active commands. Longer term we
    - * want handlers to have sensible abort handling themselves
    - *
    - * This differs fundamentally from ide_error because in
    - * this case the command is doing just fine when we
    - * blow it away.
    - */
    -
    -ide_startstop_t ide_abort(ide_drive_t *drive, const char *msg)
    -{
    - struct request *rq;
    -
    - if (drive == NULL || (rq = HWGROUP(drive)->rq) == NULL)
    - return ide_stopped;
    -
    - /* retry only "normal" I/O: */
    - if (!blk_fs_request(rq)) {
    - rq->errors = 1;
    - ide_end_drive_cmd(drive, BUSY_STAT, 0);
    - return ide_stopped;
    - }
    -
    - if (rq->rq_disk) {
    - ide_driver_t *drv;
    -
    - drv = *(ide_driver_t **)rq->rq_disk->private_data;
    - return drv->abort(drive, rq);
    - } else
    - return __ide_abort(drive, rq);
    -}
    -
    static void ide_tf_set_specify_cmd(ide_drive_t *drive, struct ide_taskfile *tf)
    {
    tf->nsect = drive->sect;
    diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
    index 2deb23d..353dd11 100644
    --- a/drivers/ide/ide-tape.c
    +++ b/drivers/ide/ide-tape.c
    @@ -2591,7 +2591,6 @@ static ide_driver_t idetape_driver = {
    .do_request = idetape_do_request,
    .end_request = idetape_end_request,
    .error = __ide_error,
    - .abort = __ide_abort,
    #ifdef CONFIG_IDE_PROC_FS
    .proc = idetape_proc,
    #endif
    diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
    index 683bce3..f843c13 100644
    --- a/drivers/scsi/ide-scsi.c
    +++ b/drivers/scsi/ide-scsi.c
    @@ -258,19 +258,6 @@ idescsi_atapi_error(ide_drive_t *drive, struct request *rq, u8 stat, u8 err)
    return ide_stopped;
    }

    -static ide_startstop_t
    -idescsi_atapi_abort(ide_drive_t *drive, struct request *rq)
    -{
    - debug_log("%s called for %lu\n", __func__,
    - ((struct ide_atapi_pc *) rq->special)->scsi_cmd->serial_number);
    -
    - rq->errors |= ERROR_MAX;
    -
    - idescsi_end_request(drive, 0, 0);
    -
    - return ide_stopped;
    -}
    -
    static int idescsi_end_request (ide_drive_t *drive, int uptodate, int nrsecs)
    {
    idescsi_scsi_t *scsi = drive_to_idescsi(drive);
    @@ -524,7 +511,6 @@ static ide_driver_t idescsi_driver = {
    .do_request = idescsi_do_request,
    .end_request = idescsi_end_request,
    .error = idescsi_atapi_error,
    - .abort = idescsi_atapi_abort,
    #ifdef CONFIG_IDE_PROC_FS
    .proc = idescsi_proc,
    #endif
    diff --git a/include/linux/ide.h b/include/linux/ide.h
    index 8fbe838..483df6b 100644
    --- a/include/linux/ide.h
    +++ b/include/linux/ide.h
    @@ -777,7 +777,6 @@ struct ide_driver_s {
    ide_startstop_t (*do_request)(ide_drive_t *, struct request *, sector_t);
    int (*end_request)(ide_drive_t *, int, int);
    ide_startstop_t (*error)(ide_drive_t *, struct request *rq, u8, u8);
    - ide_startstop_t (*abort)(ide_drive_t *, struct request *rq);
    struct device_driver gen_driver;
    int (*probe)(ide_drive_t *);
    void (*remove)(ide_drive_t *);
    @@ -819,10 +818,6 @@ ide_startstop_t __ide_error(ide_drive_t *, struct request *, u8, u8);

    ide_startstop_t ide_error (ide_drive_t *drive, const char *msg, byte stat);

    -ide_startstop_t __ide_abort(ide_drive_t *, struct request *);
    -
    -extern ide_startstop_t ide_abort(ide_drive_t *, const char *);
    -
    extern void ide_fix_driveid(struct hd_driveid *);

    extern void ide_fixstring(u8 *, const int, const int);

    \
     
     \ /
      Last update: 2008-06-23 01:35    [W:0.037 / U:1.756 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site