From df1a0a8cf859ba6fe7d7ae8f177ddcc36a957842 Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Mon, 15 May 2006 20:57:49 +0900
Subject: [PATCH] --- yaml --- r: 29294 b: refs/heads/master c:
 a0ab51cefc95cb7756c4914603fea2b1a0f813c5 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/libata.h | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 4ba5beff05f1..ca38ce16b587 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81952c5497b40ae56835bd0d6537f8c6bdea07e7
+refs/heads/master: a0ab51cefc95cb7756c4914603fea2b1a0f813c5
diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h
index 47b97157995d..cd467cd54473 100644
--- a/trunk/include/linux/libata.h
+++ b/trunk/include/linux/libata.h
@@ -939,28 +939,6 @@ static inline u8 ata_irq_ack(struct ata_port *ap, unsigned int chk_drq)
 	return status;
 }
 
-static inline u32 scr_read(struct ata_port *ap, unsigned int reg)
-{
-	return ap->ops->scr_read(ap, reg);
-}
-
-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;
-}
-
 static inline int ata_try_flush_cache(const struct ata_device *dev)
 {
 	return ata_id_wcache_enabled(dev->id) ||