From: Jeff Garzik <jeff@garzik.org>
To: Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-ide@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: [git patches] libata updates
Date: Mon, 25 Feb 2008 17:38:59 -0500 [thread overview]
Message-ID: <20080225223859.GA24360@havoc.gtf.org> (raw)
(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"
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index fbc2435..4fbcce7 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -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);
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 6036ded..aa884f7 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -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;
next reply other threads:[~2008-02-25 22:39 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-25 22:38 Jeff Garzik [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-04-30 22:26 [git patches] libata updates Jeff Garzik
2013-04-30 23:18 ` Linus Torvalds
2012-07-25 20:35 Jeff Garzik
2012-07-25 20:43 ` Jeff Garzik
2012-07-25 22:06 ` Linus Torvalds
2012-07-25 22:26 ` Jeff Garzik
2012-07-25 22:31 ` Linus Torvalds
2012-07-25 22:58 ` Jeff Garzik
2012-07-25 23:30 ` Linus Torvalds
2012-07-26 2:10 ` Jeff Garzik
2012-07-26 17:14 ` Linus Torvalds
2012-07-26 7:44 ` Ingo Molnar
2012-07-25 21:38 ` Jeff Garzik
2012-07-26 4:47 ` Aaron Lu
2012-07-26 5:05 ` James Bottomley
2012-07-26 5:17 ` Aaron Lu
2012-07-26 14:58 ` Alan Stern
2011-01-28 8:29 Jeff Garzik
2010-08-04 1:55 Jeff Garzik
2010-08-04 18:32 ` Linus Torvalds
2010-08-04 18:46 ` Jeff Garzik
2010-06-02 18:08 Jeff Garzik
2010-05-28 1:18 Jeff Garzik
2009-12-19 18:13 Jeff Garzik
2009-12-19 19:05 ` Linus Torvalds
2009-12-19 20:11 ` Jeff Garzik
2009-09-17 20:49 Jeff Garzik
2009-09-20 21:05 ` Bartlomiej Zolnierkiewicz
2009-09-22 2:36 ` Jung-Ik (John) Lee
2009-09-28 15:34 ` Bartlomiej Zolnierkiewicz
2009-09-28 20:20 ` Jung-Ik (John) Lee
2009-09-28 20:36 ` Jeff Garzik
2009-09-28 20:49 ` Jung-Ik (John) Lee
2009-10-06 4:24 ` Jeff Garzik
2009-10-06 22:26 ` Bartlomiej Zolnierkiewicz
2009-10-06 23:02 ` Jeff Garzik
2009-06-23 6:06 Jeff Garzik
2009-04-07 1:42 Jeff Garzik
2009-03-25 3:01 Jeff Garzik
2009-02-03 4:27 Jeff Garzik
2009-01-08 21:46 Jeff Garzik
2008-10-28 4:45 Jeff Garzik
2008-08-22 7:04 Jeff Garzik
2008-07-31 6:51 Jeff Garzik
2008-05-19 22:57 Jeff Garzik
2008-05-06 15:48 Jeff Garzik
2008-05-06 16:23 ` Linus Torvalds
2008-04-29 6:25 Jeff Garzik
2008-02-06 12:14 Jeff Garzik
2008-02-01 18:33 Jeff Garzik
2008-01-25 23:16 Jeff Garzik
2007-10-25 7:49 Jeff Garzik
2007-10-15 20:20 Jeff Garzik
2007-07-20 15:00 Jeff Garzik
2007-07-12 20:20 Jeff Garzik
2007-07-10 18:36 Jeff Garzik
2007-05-11 22:32 Jeff Garzik
2007-04-29 16:15 Jeff Garzik
2007-04-30 19:52 ` Chuck Ebbert
2007-04-30 20:05 ` Jeff Garzik
2007-04-30 20:22 ` Stephen Clark
2007-04-30 20:31 ` Alan Cox
2007-04-30 20:51 ` alan
2007-04-30 20:31 ` Jeff Garzik
2007-05-01 11:55 ` Stephen Clark
2007-05-01 21:38 ` Jesse Barnes
2007-05-01 22:45 ` Stephen Clark
2007-05-01 22:49 ` Jesse Barnes
2007-05-01 22:49 ` Chuck Ebbert
2007-05-02 0:48 ` Stephen Clark
2007-04-30 22:06 ` Chuck Ebbert
2007-04-30 22:11 ` Jeff Garzik
2007-05-01 21:34 ` Jesse Barnes
2007-05-10 0:18 ` Jeff Garzik
2006-12-14 23:08 Jeff Garzik
2006-12-15 1:14 ` Alan
2006-12-07 12:40 Jeff Garzik
2006-10-04 6:02 Jeff Garzik
2006-10-04 11:47 ` Alan Cox
2006-10-04 14:34 ` Alan Cox
[not found] <20060924162850.GA14323@havoc.gtf.org>
2006-09-24 16:33 ` Jeff Garzik
2006-03-30 22:01 Jeff Garzik
2006-03-24 15:59 Jeff Garzik
2006-03-23 1:15 Jeff Garzik
2006-03-23 1:36 ` Jeff Garzik
2006-03-20 11:16 Jeff Garzik
2006-03-20 16:35 ` Alan Cox
2006-03-21 1:12 ` Jeff Garzik
2006-03-21 10:20 ` Alan Cox
2006-03-21 16:40 ` Jeff Garzik
2006-03-21 17:23 ` Alan Cox
2006-02-01 4:14 Jeff Garzik
2005-09-23 23:11 Jeff Garzik
2005-09-07 6:10 Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080225223859.GA24360@havoc.gtf.org \
--to=jeff@garzik.org \
--cc=akpm@linux-foundation.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).