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

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

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



As a nice side effect, this minimizes the IRQ handler execution time.

There should be no functionality change resulting from this patch.

[bart: remove extra newlines from ide_cd_do_request()]

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

drivers/ide/ide-cd.c

+4 −5
Original line number Diff line number Diff line
@@ -1143,9 +1143,6 @@ static ide_startstop_t cdrom_do_newpc_cont(ide_drive_t *drive) 
{

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



	if (!rq->timeout)

		rq->timeout = ATAPI_WAIT_PC;



	return cdrom_transfer_packet_command(drive, rq, cdrom_newpc_intr);

}
@@ -1242,6 +1239,10 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq, 
		   rq->cmd_type == REQ_TYPE_ATA_PC) {

		xferlen = rq->data_len;

		fn = cdrom_do_newpc_cont;



		if (!rq->timeout)

			rq->timeout = ATAPI_WAIT_PC;



		cdrom_do_block_pc(drive, rq);

	} else if (blk_special_request(rq)) {

		/* right now this can only be a reset... */
@@ -1256,8 +1257,6 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq, 
	return cdrom_start_packet_command(drive, xferlen, fn);

}







/*

 * Ioctl handling.

 *