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

Commit 90eb808e authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-cd: move request prep from cdrom_start_rw_cont to rq issue path 



... by factoring out the rq preparation code into a separate
function called in the request routine.  As a nice side effect,
this minimizes the IRQ handler execution time.

There should be no functionality change resulting from this patch.

[bart: s/HWGROUP()/drive->hwif->hwgroup/ and remove extra newline]

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

drivers/ide/ide-cd.c

+19 −9
Original line number Diff line number Diff line
@@ -666,16 +666,9 @@ static int ide_cd_check_transfer_size(ide_drive_t *drive, int len) 


static ide_startstop_t cdrom_newpc_intr(ide_drive_t *);



/*

 * Routine to send a read/write packet command to the drive. This is usually

 * called directly from cdrom_start_{read,write}(). However, for drq_interrupt

 * devices, it is called from an interrupt when the drive is ready to accept

 * the command.

 */

static ide_startstop_t cdrom_start_rw_cont(ide_drive_t *drive)

static ide_startstop_t ide_cd_prepare_rw_request(ide_drive_t *drive,

						 struct request *rq)

{

	struct request *rq = HWGROUP(drive)->rq;



	if (rq_data_dir(rq) == READ) {

		unsigned short sectors_per_frame =

			queue_hardsect_size(drive->queue) >> SECTOR_BITS;
@@ -712,6 +705,19 @@ static ide_startstop_t cdrom_start_rw_cont(ide_drive_t *drive) 
	/* set up the command */

	rq->timeout = ATAPI_WAIT_PC;



	return ide_started;

}



/*

 * Routine to send a read/write packet command to the drive. This is usually

 * called directly from cdrom_start_{read,write}(). However, for drq_interrupt

 * devices, it is called from an interrupt when the drive is ready to accept

 * the command.

 */

static ide_startstop_t cdrom_start_rw_cont(ide_drive_t *drive)

{

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



	/* send the command to the drive and return */

	return cdrom_transfer_packet_command(drive, rq, cdrom_newpc_intr);

}
@@ -1224,8 +1230,12 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq, 
		} else {

			xferlen = 32768;

			fn = cdrom_start_rw_cont;



			if (cdrom_start_rw(drive, rq) == ide_stopped)

				return ide_stopped;



			if (ide_cd_prepare_rw_request(drive, rq) == ide_stopped)

				return ide_stopped;

		}

		info->last_block = block;

	} else if (blk_sense_request(rq) || blk_pc_request(rq) ||