aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-17 08:55:00 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-17 08:55:00 -0700
commitad542ef5b2296fa7a8518e6be67c4588b750d316 (patch)
treee039ed07c5cd2163dee880cb7970a70333c532aa /include/linux
parentff96b3d4b840e8aa126e0a60fd743417ffdee178 (diff)
parentf3ac91cf521be4637236d2dcb7ad4aa91f8865f0 (diff)
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-2.6.git
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/libata.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 505160ab472..1f7e2039a04 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -584,6 +584,13 @@ static inline void scr_write(struct ata_port *ap, unsigned int reg, u32 val)
ap->ops->scr_write(ap, reg, val);
}
+static inline void scr_write_flush(struct ata_port *ap, unsigned int reg,
+ u32 val)
+{
+ ap->ops->scr_write(ap, reg, val);
+ (void) ap->ops->scr_read(ap, reg);
+}
+
static inline unsigned int sata_dev_present(struct ata_port *ap)
{
return ((scr_read(ap, SCR_STATUS) & 0xf) == 0x3) ? 1 : 0;