From 54c050f3bfa135e90cf22f3f5111937c8e7102ce Mon Sep 17 00:00:00 2001
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Fri, 17 Oct 2008 18:09:16 +0200
Subject: [PATCH] --- yaml --- r: 116327 b: refs/heads/master c:
 ea656980f40d599400d2306b23f2fbc707ae7313 h: refs/heads/master i:   116325:
 89b4030faa06acba40f220223e2070cd177ae942   116323:
 49dca1f2889f361d3397dc849b395ba7cff3c7b8   116319:
 2b17ed2f8c7ab385fb9124c6227f07d4b510ed4c v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ide/pci/sgiioc4.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 1700f6dcef39..37c0eae131dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea2ac5a3b7d33ff9f41ddcee2a92c95b5a32f4e2
+refs/heads/master: ea656980f40d599400d2306b23f2fbc707ae7313
diff --git a/trunk/drivers/ide/pci/sgiioc4.c b/trunk/drivers/ide/pci/sgiioc4.c
index dd634541ce36..8581789352aa 100644
--- a/trunk/drivers/ide/pci/sgiioc4.c
+++ b/trunk/drivers/ide/pci/sgiioc4.c
@@ -108,13 +108,6 @@ sgiioc4_init_hwif_ports(hw_regs_t * hw, unsigned long data_port,
 		hw->io_ports.irq_addr = irq_port;
 }
 
-static void
-sgiioc4_maskproc(ide_drive_t * drive, int mask)
-{
-	writeb(ATA_DEVCTL_OBS | (mask ? 2 : 0),
-	       (void __iomem *)drive->hwif->io_ports.ctl_addr);
-}
-
 static int
 sgiioc4_checkirq(ide_hwif_t * hwif)
 {
@@ -563,8 +556,6 @@ static const struct ide_port_ops sgiioc4_port_ops = {
 	.set_dma_mode		= sgiioc4_set_dma_mode,
 	/* reset DMA engine, clear IRQs */
 	.resetproc		= sgiioc4_resetproc,
-	/* mask on/off NIEN register */
-	.maskproc		= sgiioc4_maskproc,
 };
 
 static const struct ide_dma_ops sgiioc4_dma_ops = {