power_state: get rid of write-only variable in SATA
authorPavel Machek <pavel@ucw.cz>
Thu, 21 Feb 2008 12:56:55 +0000 (13:56 +0100)
committerJeff Garzik <jeff@garzik.org>
Sun, 24 Feb 2008 05:27:26 +0000 (00:27 -0500)
power_state is scheduled for removal, and libata uses it in write-only
mode. Remove it.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/ata/libata-core.c

index 4cf8662..9812bbf 100644 (file)
@@ -6560,8 +6560,6 @@ int ata_host_suspend(struct ata_host *host, pm_message_t mesg)
        ata_lpm_enable(host);
 
        rc = ata_host_request_pm(host, mesg, 0, ATA_EHI_QUIET, 1);
-       if (rc == 0)
-               host->dev->power.power_state = mesg;
        return rc;
 }
 
@@ -6580,7 +6578,6 @@ void ata_host_resume(struct ata_host *host)
 {
        ata_host_request_pm(host, PMSG_ON, ATA_EH_SOFTRESET,
                            ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET, 0);
-       host->dev->power.power_state = PMSG_ON;
 
        /* reenable link pm */
        ata_lpm_disable(host);