libata: ATA_EHI_LPM should be ATA_EH_LPM
PATCH 1/1 libata: ATA_EHI_LPM should be ATA_EH_LPM
EH actions are ATA_EH_* not ATA_EHI_*. Rename ATA_EHI_LPM to ATA_EH_LPM.
Signed-off-by Tejun Heo <[email protected]>
Cc Kristen Carlson Accardi <[email protected]>
---
drivers/ata/libata-core.c | 2 +- drivers/ata/libata-eh.c | 2 +- include/linux/libata.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/ata/libata-core.c +0 -0
@@ -972,7 +972,7 @@ static void ata_dev_disable_pm(struct at
void ata_lpm_schedule(struct ata_port *ap, enum link_pm policy)
{
ap->pm_policy = policy;
- ap->link.eh_info.action |= ATA_EHI_LPM;
+ ap->link.eh_info.action |= ATA_EH_LPM;
ap->link.eh_info.flags |= ATA_EHI_NO_AUTOPSY;
ata_port_schedule_eh(ap);
}drivers/ata/libata-eh.c +0 -0
@@ -2748,7 +2748,7 @@ int ata_eh_recover(struct ata_port *ap,
ehc->i.flags &= ~ATA_EHI_SETMODE; }
- if (ehc->i.action & ATA_EHI_LPM)
+ if (ehc->i.action & ATA_EH_LPM)
ata_link_for_each_dev(dev, link) ata_dev_enable_pm(dev, ap->pm_policy);
include/linux/libata.h +0 -0
@@ -295,6 +295,7 @@ enum {
ATA_EH_SOFTRESET = (1 << 1), ATA_EH_HARDRESET = (1 << 2), ATA_EH_ENABLE_LINK = (1 << 3),
+ ATA_EH_LPM = (1 << 4), /* link power management action */
ATA_EH_RESET_MASK = ATA_EH_SOFTRESET | ATA_EH_HARDRESET,
ATA_EH_PERDEV_MASK = ATA_EH_REVALIDATE,
@@ -304,7 +305,6 @@ enum {
ATA_EHI_RESUME_LINK = (1 << 1), /* resume link (reset modifier) */
ATA_EHI_NO_AUTOPSY = (1 << 2), /* no autopsy */
ATA_EHI_QUIET = (1 << 3), /* be quiet */- ATA_EHI_LPM = (1 << 4), /* link power management action */
ATA_EHI_DID_SOFTRESET = (1 << 16), /* already soft-reset this port */ ATA_EHI_DID_HARDRESET = (1 << 17), /* already soft-reset this port */
Jeff Garzik
AppliedQuoted 10 lines · Tejun Heo
EH actions are ATA_EH_* not ATA_EHI_*. Rename
ATA_EHI_LPMtoATA_EH_LPM.Signed-off-by Tejun Heo <[email protected]>Cc Kristen Carlson Accardi <[email protected]>---
drivers/ata/libata-core.c | 2 +- drivers/ata/libata-eh.c | 2 +- include/linux/libata.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
applied