Commit 0fecb508 authored by Damien Le Moal's avatar Damien Le Moal
Browse files

ata: libata-eh: Reduce "disable device" message verbosity 



There is no point in warning about a device being disabled when we
expect it to be, that is, on suspend, shutdown or when detaching the
device.

Suppress the message "disable device" for these cases by introducing the
EH static function ata_eh_dev_disable() and by using it in
ata_eh_unload() and ata_eh_detach_dev(). ata_dev_disable() code is
modified to call this new function after printing the "disable device"
message.

Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Tested-by: default avatarChia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7f95731c

drivers/ata/libata-eh.c

+19 −13
Original line number Diff line number Diff line
@@ -494,6 +494,18 @@ void ata_eh_release(struct ata_port *ap) 
	mutex_unlock(&ap->host->eh_mutex);

}



static void ata_eh_dev_disable(struct ata_device *dev)

{

	ata_acpi_on_disable(dev);

	ata_down_xfermask_limit(dev, ATA_DNXFER_FORCE_PIO0 | ATA_DNXFER_QUIET);

	dev->class++;



	/* From now till the next successful probe, ering is used to

	 * track probe failures.  Clear accumulated device error info.

	 */

	ata_ering_clear(&dev->ering);

}



static void ata_eh_unload(struct ata_port *ap)

{

	struct ata_link *link;
@@ -517,8 +529,8 @@ static void ata_eh_unload(struct ata_port *ap) 
	 */

	ata_for_each_link(link, ap, PMP_FIRST) {

		sata_scr_write(link, SCR_CONTROL, link->saved_scontrol & 0xff0);

		ata_for_each_dev(dev, link, ALL)

			ata_dev_disable(dev);

		ata_for_each_dev(dev, link, ENABLED)

			ata_eh_dev_disable(dev);

	}



	/* freeze and set UNLOADED */
@@ -1211,14 +1223,8 @@ void ata_dev_disable(struct ata_device *dev) 
		return;



	ata_dev_warn(dev, "disable device\n");

	ata_acpi_on_disable(dev);

	ata_down_xfermask_limit(dev, ATA_DNXFER_FORCE_PIO0 | ATA_DNXFER_QUIET);

	dev->class++;



	/* From now till the next successful probe, ering is used to

	 * track probe failures.  Clear accumulated device error info.

	 */

	ata_ering_clear(&dev->ering);

	ata_eh_dev_disable(dev);

}

EXPORT_SYMBOL_GPL(ata_dev_disable);
@@ -1240,12 +1246,12 @@ void ata_eh_detach_dev(struct ata_device *dev) 


	/*

	 * If the device is still enabled, transition it to standby power mode

	 * (i.e. spin down HDDs).

	 * (i.e. spin down HDDs) and disable it.

	 */

	if (ata_dev_enabled(dev))

	if (ata_dev_enabled(dev)) {

		ata_dev_power_set_standby(dev);



	ata_dev_disable(dev);

		ata_eh_dev_disable(dev);

	}



	spin_lock_irqsave(ap->lock, flags);