From 2dbd51c37c2ab206cce36d8c92b3f78f0cda7302 Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Tue, 25 Mar 2008 21:35:30 +0900
Subject: [PATCH] --- yaml --- r: 89252 b: refs/heads/master c:
 b0316b15ace0570c87b74c81f1296cf7bf8d459e h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/ata/pdc_adma.c | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 0384225bc277..d74364458e7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed82f96425e744dffe62115e46f08eb785c0b2f3
+refs/heads/master: b0316b15ace0570c87b74c81f1296cf7bf8d459e
diff --git a/trunk/drivers/ata/pdc_adma.c b/trunk/drivers/ata/pdc_adma.c
index 577a0e556f7a..6a4654e309a5 100644
--- a/trunk/drivers/ata/pdc_adma.c
+++ b/trunk/drivers/ata/pdc_adma.c
@@ -147,25 +147,15 @@ static struct scsi_host_template adma_ata_sht = {
 };
 
 static struct ata_port_operations adma_ata_ops = {
-	.inherits		= &ata_base_port_ops,
-
-	.dev_select		= ata_std_dev_select,
-	.tf_load		= ata_tf_load,
-	.tf_read		= ata_tf_read,
-	.check_status		= ata_check_status,
-	.exec_command		= ata_exec_command,
-	.data_xfer		= ata_data_xfer,
+	.inherits		= &ata_sff_port_ops,
+
 	.check_atapi_dma	= adma_check_atapi_dma,
 	.qc_prep		= adma_qc_prep,
 	.qc_issue		= adma_qc_issue,
-	.irq_on			= ata_irq_on,
 
 	.freeze			= adma_freeze,
 	.thaw			= adma_thaw,
 	.prereset		= adma_prereset,
-	.softreset		= ata_std_softreset,
-	.error_handler		= ata_bmdma_error_handler,
-	.post_internal_cmd	= ata_bmdma_post_internal_cmd,
 
 	.port_start		= adma_port_start,
 	.port_stop		= adma_port_stop,