ide: don't display "BIOS" settings in ide_setup_dma()

[linux-2.6] / drivers / ide / ide-probe.c

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 670d7f9ccf0e3692e7179e4a7eab36a08056d760..d2faef17e548bdcd1fbc1f6062700862e14bcf4d 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -644,7 +644,7 @@ static int ide_register_port(ide_hwif_t *hwif)
        ret = device_register(&hwif->gendev);
        if (ret < 0) {
                printk(KERN_WARNING "IDE: %s: device_register error: %d\n",
-                       __FUNCTION__, ret);
+                       __func__, ret);
                goto out;
        }
 
@@ -1530,12 +1530,6 @@ int ide_device_add_all(u8 *idx, const struct ide_port_info *d)
 
                hwif = &ide_hwifs[idx[i]];
 
-               if (ide_hwif_request_regions(hwif)) {
-                       printk(KERN_ERR "%s: ports already in use, "
-                                       "skipping probe\n", hwif->name);
-                       continue;
-               }
-
                if (ide_probe_port(hwif) == 0)
                        hwif->present = 1;
 
@@ -1667,7 +1661,6 @@ static void ide_legacy_init_one(u8 *idx, hw_regs_t *hw, u8 port_no,
        hwif = ide_find_port_slot(d);
        if (hwif) {
                ide_init_port_hw(hwif, hw);
-               hwif->mmio = 1;
                if (config)
                        hwif->config_data = config;
                idx[port_no] = hwif->index;