diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 16:25:18 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 16:25:18 -0400 |
commit | 2c4be251be1cace01a2a18bf5abb847010516511 (patch) | |
tree | 65ab1a6cf45006101d843c042db849f35a6cf71a /drivers/ide/ide-probe.c | |
parent | 1664949843e8c0782c8f2e40897285a8dfffdf27 (diff) |
ide-4drives: manage I/O resources in driver
* Tell IDE layer to not manage resources by setting hwif->mmio flag.
* Use {request,release}_region() for resources management.
* Use driver name for resources management.
* Remove no longer needed 'hwif->chipset == ide_4drives' handling
from ide_device_add_all().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index d37a2680ceed..da6025cfa09a 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1530,8 +1530,7 @@ int ide_device_add_all(u8 *idx, const struct ide_port_info *d) | |||
1530 | 1530 | ||
1531 | hwif = &ide_hwifs[idx[i]]; | 1531 | hwif = &ide_hwifs[idx[i]]; |
1532 | 1532 | ||
1533 | if ((hwif->chipset != ide_4drives || !hwif->mate || | 1533 | if (ide_hwif_request_regions(hwif)) { |
1534 | !hwif->mate->present) && ide_hwif_request_regions(hwif)) { | ||
1535 | printk(KERN_ERR "%s: ports already in use, " | 1534 | printk(KERN_ERR "%s: ports already in use, " |
1536 | "skipping probe\n", hwif->name); | 1535 | "skipping probe\n", hwif->name); |
1537 | continue; | 1536 | continue; |