ide: remove ide_hwif_request_regions()

Remove no longer used ide_hwif_request_regions() and hwif_request_region().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 694d997ce50f080a5207a2f7b464f2409d156256..3d989c298ff401d4a4b5b7b8665504af42614d1a 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -227,56 +227,6 @@ static int ide_system_bus_speed(void)
        return pci_dev_present(pci_default) ? 33 : 50;
 }
 
-static struct resource* hwif_request_region(ide_hwif_t *hwif,
-                                           unsigned long addr, int num)
-{
-       struct resource *res = request_region(addr, num, hwif->name);
-
-       if (!res)
-               printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n",
-                               hwif->name, addr, addr+num-1);
-       return res;
-}
-
-/**
- *     ide_hwif_request_regions - request resources for IDE
- *     @hwif: interface to use
- *
- *     Requests all the needed resources for an interface.
- *     Right now core IDE code does this work which is deeply wrong.
- *     MMIO leaves it to the controller driver,
- *     PIO will migrate this way over time.
- */
-
-int ide_hwif_request_regions(ide_hwif_t *hwif)
-{
-       unsigned long addr;
-
-       if (hwif->mmio)
-               return 0;
-
-       addr = hwif->io_ports[IDE_CONTROL_OFFSET];
-
-       if (addr && !hwif_request_region(hwif, addr, 1))
-               goto control_region_busy;
-
-       addr = hwif->io_ports[IDE_DATA_OFFSET];
-       BUG_ON((addr | 7) != hwif->io_ports[IDE_STATUS_OFFSET]);
-
-       if (!hwif_request_region(hwif, addr, 8))
-               goto data_region_busy;
-
-       return 0;
-
-data_region_busy:
-       addr = hwif->io_ports[IDE_CONTROL_OFFSET];
-       if (addr)
-               release_region(addr, 1);
-control_region_busy:
-       /* If any errors are return, we drop the hwif interface. */
-       return -EBUSY;
-}
-
 void ide_remove_port_from_hwgroup(ide_hwif_t *hwif)
 {
        ide_hwgroup_t *hwgroup = hwif->hwgroup;

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 4204d1f35eceb1da6d58bd59463603c5f97573d4..d3d64116957b3b7d19e5fd0f4920bf3a26aa0816 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1202,7 +1202,6 @@ static inline void ide_acpi_set_state(ide_hwif_t *hwif, int on) {}
 #endif
 
 void ide_remove_port_from_hwgroup(ide_hwif_t *);
-extern int ide_hwif_request_regions(ide_hwif_t *hwif);
 void ide_unregister(unsigned int);
 
 void ide_register_region(struct gendisk *);