Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ef5eb42 authored by Elias Oltmanns's avatar Elias Oltmanns Committed by Bartlomiej Zolnierkiewicz
Browse files

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: default avatarElias Oltmanns <eo@nebensachen.de>
Cc: "Alan Cox" <alan@lxorguk.ukuu.org.uk>
Cc: "Randy Dunlap" <randy.dunlap@oracle.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 79e36a9f

drivers/ide/ide-cd.c

+0 −1
Original line number Diff line number Diff line
@@ -1952,7 +1952,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

drivers/ide/ide-disk.c

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/ide/ide-floppy.c

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/ide/ide-io.c

+0 −49
Original line number Diff line number Diff line
@@ -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;

drivers/ide/ide-tape.c

+0 −1
Original line number Diff line number Diff line
@@ -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