From 2babc924fee41ae396392fd3316374ae0b21302e Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 26 Apr 2008 22:25:17 +0200
Subject: [PATCH] --- yaml --- r: 93633 b: refs/heads/master c:
 d083c03f2524af699a6b85cf4d2f8090242b1b84 h: refs/heads/master i:   93631:
 f8b55b1ce97b6904e8235ebd1994ee67623b21c0 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/ide/ide.c   | 25 -------------------------
 trunk/include/linux/ide.h |  1 -
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 95c2d6f038c2..5c641d1e369c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb716beb0aeb4b14489a64c51c63e6a4be2e13a0
+refs/heads/master: d083c03f2524af699a6b85cf4d2f8090242b1b84
diff --git a/trunk/drivers/ide/ide.c b/trunk/drivers/ide/ide.c
index 3be049067520..629383dd37db 100644
--- a/trunk/drivers/ide/ide.c
+++ b/trunk/drivers/ide/ide.c
@@ -277,29 +277,6 @@ int ide_hwif_request_regions(ide_hwif_t *hwif)
 	return -EBUSY;
 }
 
-/**
- *	ide_hwif_release_regions - free IDE resources
- *
- *	Note that we only release the standard ports,
- *	and do not even try to handle any extra ports
- *	allocated for weird IDE interface chipsets.
- *
- *	Note also that we don't yet handle mmio resources here. More
- *	importantly our caller should be doing this so we need to 
- *	restructure this as a helper function for drivers.
- */
-
-void ide_hwif_release_regions(ide_hwif_t *hwif)
-{
-	if (hwif->mmio)
-		return;
-
-	if (hwif->io_ports[IDE_CONTROL_OFFSET])
-		release_region(hwif->io_ports[IDE_CONTROL_OFFSET], 1);
-
-	release_region(hwif->io_ports[IDE_DATA_OFFSET], 8);
-}
-
 void ide_remove_port_from_hwgroup(ide_hwif_t *hwif)
 {
 	ide_hwgroup_t *hwgroup = hwif->hwgroup;
@@ -438,8 +415,6 @@ void ide_unregister(unsigned int index)
 	if (hwif->dma_base)
 		(void)ide_release_dma(hwif);
 
-	ide_hwif_release_regions(hwif);
-
 	/* restore hwif data to pristine status */
 	ide_init_port_data(hwif, index);
 
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index db9a70e25377..a2d7800a4d30 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/include/linux/ide.h
@@ -1203,7 +1203,6 @@ static inline void ide_acpi_set_state(ide_hwif_t *hwif, int on) {}
 
 void ide_remove_port_from_hwgroup(ide_hwif_t *);
 extern int ide_hwif_request_regions(ide_hwif_t *hwif);
-extern void ide_hwif_release_regions(ide_hwif_t* hwif);
 void ide_unregister(unsigned int);
 
 void ide_register_region(struct gendisk *);