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

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

ide-cd: move request prep from cdrom_start_seek_continuation 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 newlines]

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

drivers/ide/ide-cd.c

+10 −2
Original line number Diff line number Diff line
@@ -738,9 +738,8 @@ static ide_startstop_t cdrom_seek_intr(ide_drive_t *drive) 
	return ide_stopped;

}



static ide_startstop_t cdrom_start_seek_continuation(ide_drive_t *drive)

static void ide_cd_prepare_seek_request(ide_drive_t *drive, struct request *rq)

{

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

	sector_t frame = rq->sector;



	sector_div(frame, queue_hardsect_size(drive->queue) >> SECTOR_BITS);
@@ -750,6 +749,12 @@ static ide_startstop_t cdrom_start_seek_continuation(ide_drive_t *drive) 
	put_unaligned(cpu_to_be32(frame), (unsigned int *) &rq->cmd[2]);



	rq->timeout = ATAPI_WAIT_PC;

}



static ide_startstop_t cdrom_start_seek_continuation(ide_drive_t *drive)

{

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



	return cdrom_transfer_packet_command(drive, rq, &cdrom_seek_intr);

}
@@ -1211,8 +1216,11 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq, 
		    drive->dsc_overlap) {

			xferlen = 0;

			fn = cdrom_start_seek_continuation;



			info->dma = 0;

			info->start_seek = jiffies;



			ide_cd_prepare_seek_request(drive, rq);

		} else {

			xferlen = 32768;

			fn = cdrom_start_rw_cont;