IDE: Remove unused code
Remove some code which has been made obsolete and hasn't worked properly before anyway. Part of the infrastructure may be reintroduced in a follow up patch to implement a working command aborting facility. Signed-off-by: Elias Oltmanns <eo@nebensachen.de> Cc: "Alan Cox" <alan@lxorguk.ukuu.org.uk> Cc: "Randy Dunlap" <randy.dunlap@oracle.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:

committed by
Bartlomiej Zolnierkiewicz

parent
79e36a9f54
commit
3ef5eb424e
@@ -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;
|
||||
|
Reference in New Issue
Block a user