aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ide/ide.c25
-rw-r--r--include/linux/ide.h1
2 files changed, 0 insertions, 26 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 3be049067520..629383dd37db 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -277,29 +277,6 @@ control_region_busy:
277 return -EBUSY; 277 return -EBUSY;
278} 278}
279 279
280/**
281 * ide_hwif_release_regions - free IDE resources
282 *
283 * Note that we only release the standard ports,
284 * and do not even try to handle any extra ports
285 * allocated for weird IDE interface chipsets.
286 *
287 * Note also that we don't yet handle mmio resources here. More
288 * importantly our caller should be doing this so we need to
289 * restructure this as a helper function for drivers.
290 */
291
292void ide_hwif_release_regions(ide_hwif_t *hwif)
293{
294 if (hwif->mmio)
295 return;
296
297 if (hwif->io_ports[IDE_CONTROL_OFFSET])
298 release_region(hwif->io_ports[IDE_CONTROL_OFFSET], 1);
299
300 release_region(hwif->io_ports[IDE_DATA_OFFSET], 8);
301}
302
303void ide_remove_port_from_hwgroup(ide_hwif_t *hwif) 280void ide_remove_port_from_hwgroup(ide_hwif_t *hwif)
304{ 281{
305 ide_hwgroup_t *hwgroup = hwif->hwgroup; 282 ide_hwgroup_t *hwgroup = hwif->hwgroup;
@@ -438,8 +415,6 @@ void ide_unregister(unsigned int index)
438 if (hwif->dma_base) 415 if (hwif->dma_base)
439 (void)ide_release_dma(hwif); 416 (void)ide_release_dma(hwif);
440 417
441 ide_hwif_release_regions(hwif);
442
443 /* restore hwif data to pristine status */ 418 /* restore hwif data to pristine status */
444 ide_init_port_data(hwif, index); 419 ide_init_port_data(hwif, index);
445 420
diff --git a/include/linux/ide.h b/include/linux/ide.h
index db9a70e25377..a2d7800a4d30 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1203,7 +1203,6 @@ static inline void ide_acpi_set_state(ide_hwif_t *hwif, int on) {}
1203 1203
1204void ide_remove_port_from_hwgroup(ide_hwif_t *); 1204void ide_remove_port_from_hwgroup(ide_hwif_t *);
1205extern int ide_hwif_request_regions(ide_hwif_t *hwif); 1205extern int ide_hwif_request_regions(ide_hwif_t *hwif);
1206extern void ide_hwif_release_regions(ide_hwif_t* hwif);
1207void ide_unregister(unsigned int); 1206void ide_unregister(unsigned int);
1208 1207
1209void ide_register_region(struct gendisk *); 1208void ide_register_region(struct gendisk *);