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

Commit 3ee38302 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove ->end_request method 



* Handle completion of private driver requests explicitly
  for ide_floppy and ide_tape media in ide_kill_rq().

* Remove no longer needed ->end_request method.

There should be no functional changes caused by this patch.

Acked-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 313afea7

drivers/ide/ide-cd.c

+0 −1
Original line number Diff line number Diff line
@@ -1834,7 +1834,6 @@ static struct ide_driver ide_cdrom_driver = { 
	.remove			= ide_cd_remove,

	.version		= IDECD_VERSION,

	.do_request		= ide_cd_do_request,

	.end_request		= ide_end_request,

#ifdef CONFIG_IDE_PROC_FS

	.proc_entries		= ide_cd_proc_entries,

	.proc_devsets		= ide_cd_proc_devsets,

drivers/ide/ide-disk.c

+0 −1
Original line number Diff line number Diff line
@@ -734,6 +734,5 @@ const struct ide_disk_ops ide_ata_disk_ops = { 
	.init_media	= ide_disk_init_media,

	.set_doorlock	= ide_disk_set_doorlock,

	.do_request	= ide_do_rw_disk,

	.end_request	= ide_end_request,

	.ioctl		= ide_disk_ioctl,

};

drivers/ide/ide-floppy.c

+0 −20
Original line number Diff line number Diff line
@@ -61,25 +61,6 @@ 
 */

#define IDEFLOPPY_PC_DELAY	(HZ/20)	/* default delay for ZIP 100 (50ms) */



/*

 * Used to finish servicing a private request.

 */

static int ide_floppy_end_request(ide_drive_t *drive, int uptodate, int nsecs)

{

	struct request *rq = drive->hwif->rq;



	ide_debug_log(IDE_DBG_FUNC, "enter");



	if (uptodate == 0)

		drive->failed_pc = NULL;



	rq->errors = uptodate ? 0 : IDE_DRV_ERROR_GENERAL;



	ide_complete_rq(drive, 0);



	return 0;

}



static void idefloppy_update_buffers(ide_drive_t *drive,

				struct ide_atapi_pc *pc)

{
@@ -560,6 +541,5 @@ const struct ide_disk_ops ide_atapi_disk_ops = { 
	.init_media	= ide_floppy_init_media,

	.set_doorlock	= ide_set_media_lock,

	.do_request	= ide_floppy_do_request,

	.end_request	= ide_floppy_end_request,

	.ioctl		= ide_floppy_ioctl,

};

drivers/ide/ide-gd.c

+0 −6
Original line number Diff line number Diff line
@@ -145,11 +145,6 @@ static ide_startstop_t ide_gd_do_request(ide_drive_t *drive, 
	return drive->disk_ops->do_request(drive, rq, sector);

}



static int ide_gd_end_request(ide_drive_t *drive, int uptodate, int nrsecs)

{

	return drive->disk_ops->end_request(drive, uptodate, nrsecs);

}



static struct ide_driver ide_gd_driver = {

	.gen_driver = {

		.owner		= THIS_MODULE,
@@ -162,7 +157,6 @@ static struct ide_driver ide_gd_driver = { 
	.shutdown		= ide_gd_shutdown,

	.version		= IDE_GD_VERSION,

	.do_request		= ide_gd_do_request,

	.end_request		= ide_gd_end_request,

#ifdef CONFIG_IDE_PROC_FS

	.proc_entries		= ide_disk_proc_entries,

	.proc_devsets		= ide_disk_proc_devsets,

drivers/ide/ide-io.c

+7 −7
Original line number Diff line number Diff line
@@ -178,17 +178,17 @@ EXPORT_SYMBOL(ide_complete_rq); 


void ide_kill_rq(ide_drive_t *drive, struct request *rq)

{

	u8 drv_req = blk_special_request(rq) && rq->rq_disk;

	u8 media = drive->media;



	drive->failed_pc = NULL;



	if (drive->media == ide_tape)

	if ((media == ide_floppy && drv_req) || media == ide_tape)

		rq->errors = IDE_DRV_ERROR_GENERAL;



	if (blk_special_request(rq) && rq->rq_disk) {

		struct ide_driver *drv;



		drv = *(struct ide_driver **)rq->rq_disk->private_data;

		drv->end_request(drive, 0, 0);

	} else

	if ((media == ide_floppy || media == ide_tape) && drv_req)

		ide_complete_rq(drive, 0);

	else

		ide_end_request(drive, 0, 0);

}