From d083c03f2524af699a6b85cf4d2f8090242b1b84 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sat, 26 Apr 2008 22:25:17 +0200 Subject: [PATCH] ide: remove ide_hwif_release_regions() All host drivers using ide_unregister()/module_exit() have been fixed to manage resources themselves so this function can be removed now. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/ide.c | 25 ------------------------- include/linux/ide.h | 1 - 2 files changed, 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: 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/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) {} 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 *); -- 2.34.1