Commit 12980c1f authored by Damien Le Moal's avatar Damien Le Moal
Browse files

ata: libata-eh: Use ata_ncq_enabled() in ata_eh_speed_down() 



In ata_eh_speed_down(), instead of hard-coding the test on the device
flags to detect if NCQ is supported and enabled, use ata_ncq_enabled().

Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
parent 45623d33

drivers/ata/libata-eh.c

+1 −3
Original line number Diff line number Diff line
@@ -1817,9 +1817,7 @@ static unsigned int ata_eh_speed_down(struct ata_device *dev, 
	verdict = ata_eh_speed_down_verdict(dev);



	/* turn off NCQ? */

	if ((verdict & ATA_EH_SPDN_NCQ_OFF) &&

	    (dev->flags & (ATA_DFLAG_PIO | ATA_DFLAG_NCQ |

			   ATA_DFLAG_NCQ_OFF)) == ATA_DFLAG_NCQ) {

	if ((verdict & ATA_EH_SPDN_NCQ_OFF) && ata_ncq_enabled(dev)) {

		dev->flags |= ATA_DFLAG_NCQ_OFF;

		ata_dev_warn(dev, "NCQ disabled due to excessive errors\n");

		goto done;