From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Thu, 25 Jun 2009 01:01:45 +0000 (-0400)
Subject: libata: Delegate nonrot flag setting to SCSI
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f17259a31237cf0fd5c6c8cf2a4f9e6df405744b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

libata: Delegate nonrot flag setting to SCSI

Now that the SCSI disk driver correctly handles non-rotational devices
we can move setting the queue flag to SCSI.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index de3a0050760a..5d7a1bd37e9a 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1119,10 +1119,6 @@ static int ata_scsi_dev_config(struct scsi_device *sdev,
 
 		blk_queue_dma_drain(q, atapi_drain_needed, buf, ATAPI_MAX_DRAIN);
 	} else {
-		if (ata_id_is_ssd(dev->id))
-			queue_flag_set_unlocked(QUEUE_FLAG_NONROT,
-						sdev->request_queue);
-
 		/* ATA devices must be sector aligned */
 		blk_queue_update_dma_alignment(sdev->request_queue,
 					       ATA_SECT_SIZE - 1);