libata updates
PATCH 1/1 libata updates
(additional explanation for the revert is in the full changeset description)
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
drivers/ata/libata-core.c | 5 ++++- drivers/ata/libata.h | 1 - 2 files changed, 4 insertions(+), 2 deletions(-)
Adrian Bunk (1):
make atapi_dmadir static
Jeff Garzik (1):
Revert "power_state: get rid of write-only variable in SATA"
drivers/ata/libata-core.c +4 -1
@@ -113,7 +113,7 @@ int atapi_enabled = 1;module_param (atapi_enabled, int,0444 );MODULE_PARM_DESC (atapi_enabled,"Enable discovery of ATAPI devices (0=off, 1=on)" ); -int atapi_dmadir =0 ; +static int atapi_dmadir =0 ;module_param (atapi_dmadir, int,0444 );MODULE_PARM_DESC (atapi_dmadir,"Enable ATAPI DMADIR bridge support (0=off, 1=on)" );
@@ -6567,6 +6567,8 @@ 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; }
@@ -6585,6 +6587,7 @@ 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);
drivers/ata/libata.h +0 -1
@@ -56,7 +56,6 @@ enum {extern unsigned int ata_print_id;extern struct workqueue_struct *ata_aux_wq;extern int atapi_enabled; -extern int atapi_dmadir;extern int atapi_passthru16;extern int libata_fua;extern int libata_noacpi;