Commit 22cfba10 authored by Niklas Cassel's avatar Niklas Cassel Committed by Damien Le Moal
Browse files

ata: libata-eh: Rename hipm and dipm variables 



Rename the hipm and dipm variables to have a clearer name.
Also fold in the usage of no_dipm, as that is required in order to give
the dipm variable a more descriptive name.

No functional change.

Signed-off-by: default avatarNiklas Cassel <cassel@kernel.org>
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
parent 62eef53a

drivers/ata/libata-eh.c

+9 −6
Original line number Diff line number Diff line
@@ -3455,22 +3455,23 @@ static int ata_eh_set_lpm(struct ata_link *link, enum ata_lpm_policy policy, 
	 * some devices misbehave when the host NACKs transition to SLUMBER.

	 */

	ata_for_each_dev(dev, link, ENABLED) {

		bool hipm = ata_id_has_hipm(dev->id);

		bool dipm = ata_id_has_dipm(dev->id) && !no_dipm;

		bool dev_has_hipm = ata_id_has_hipm(dev->id);

		bool dev_has_dipm = ata_id_has_dipm(dev->id);



		/* find the first enabled and LPM enabled devices */

		if (!link_dev)

			link_dev = dev;



		if (!lpm_dev && (hipm || dipm))

		if (!lpm_dev && (dev_has_hipm || (dev_has_dipm && !no_dipm)))

			lpm_dev = dev;



		hints &= ~ATA_LPM_EMPTY;

		if (!hipm)

		if (!dev_has_hipm)

			hints &= ~ATA_LPM_HIPM;



		/* disable DIPM before changing link config */

		if (policy < ATA_LPM_MED_POWER_WITH_DIPM && dipm) {

		if (policy < ATA_LPM_MED_POWER_WITH_DIPM &&

		    (dev_has_dipm && !no_dipm)) {

			err_mask = ata_dev_set_feature(dev,

					SETFEATURES_SATA_DISABLE, SATA_DIPM);

			if (err_mask && err_mask != AC_ERR_DEV) {
@@ -3517,8 +3518,10 @@ static int ata_eh_set_lpm(struct ata_link *link, enum ata_lpm_policy policy, 
	 * ATA_LPM_MED_POWER_WITH_DIPM.

	 */

	ata_for_each_dev(dev, link, ENABLED) {

		bool dev_has_dipm = ata_id_has_dipm(dev->id);



		if (policy >= ATA_LPM_MED_POWER_WITH_DIPM && !no_dipm &&

		    ata_id_has_dipm(dev->id)) {

		    dev_has_dipm) {

			err_mask = ata_dev_set_feature(dev,

					SETFEATURES_SATA_ENABLE, SATA_DIPM);

			if (err_mask && err_mask != AC_ERR_DEV) {