Commit 5ae65383 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ide: Mark power management requests with RQF_PM instead of RQF_PREEMPT 

This is another step that prepares for the removal of RQF_PREEMPT.

Link: https://lore.kernel.org/r/20201209052951.16136-5-bvanassche@acm.org


Cc: David S. Miller <davem@davemloft.net>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Can Guo <cang@codeaurora.org>
Cc: Stanley Chu <stanley.chu@mediatek.com>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 96d86e6a

drivers/ide/ide-io.c

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ blk_status_t ide_issue_rq(ide_drive_t *drive, struct request *rq, 
		 */

		if ((drive->dev_flags & IDE_DFLAG_BLOCKED) &&

		    ata_pm_request(rq) == 0 &&

		    (rq->rq_flags & RQF_PREEMPT) == 0) {

		    (rq->rq_flags & RQF_PM) == 0) {

			/* there should be no pending command at this point */

			ide_unlock_port(hwif);

			goto plug_device;

drivers/ide/ide-pm.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ int generic_ide_resume(struct device *dev) 
	}



	memset(&rqpm, 0, sizeof(rqpm));

	rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, BLK_MQ_REQ_PREEMPT);

	rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, BLK_MQ_REQ_PM);

	ide_req(rq)->type = ATA_PRIV_PM_RESUME;

	ide_req(rq)->special = &rqpm;

	rqpm.pm_step = IDE_PM_START_RESUME;