diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-16 20:33:42 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-16 20:33:42 +0200 |
| commit | eb3aff5530d22eb4be0a99c9d39c9ffde7b9891a (patch) | |
| tree | f358ec61f76efb716c90d4788131fda52107eac5 /drivers/ide/h8300 | |
| parent | 7b60fa16ca50b0f8cb9d007faee0dff71b397fb8 (diff) | |
| download | linux-eb3aff5530d22eb4be0a99c9d39c9ffde7b9891a.tar.gz linux-eb3aff5530d22eb4be0a99c9d39c9ffde7b9891a.tar.bz2 linux-eb3aff5530d22eb4be0a99c9d39c9ffde7b9891a.zip | |
ide: print message on error in ide_find_port_slot()
* Add DRV_NAME define to ide-h8300.c.
* Fix ide-h8300.c, swarm.c and sgiioc4.c to set .name field in
struct ide_port_info to DRV_NAME, then convert these host drivers
to use ide_find_port_slot() instead of ide_find_port().
* Print message on error in ide_find_port_slot().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/h8300')
| -rw-r--r-- | drivers/ide/h8300/ide-h8300.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c index ff6a98afefb7..c445298f7eb8 100644 --- a/drivers/ide/h8300/ide-h8300.c +++ b/drivers/ide/h8300/ide-h8300.c @@ -8,6 +8,8 @@ #include <asm/io.h> #include <asm/irq.h> +#define DRV_NAME "ide-h8300" + #define bswap(d) \ ({ \ u16 r; \ @@ -196,11 +198,9 @@ static int __init h8300_ide_init(void) hw_setup(&hw); - hwif = ide_find_port(); - if (hwif == NULL) { - printk(KERN_ERR "ide-h8300: IDE I/F register failed\n"); + hwif = ide_find_port_slot(&h8300_port_info); + if (hwif == NULL) return -ENOENT; - } index = hwif->index; ide_init_port_hw(hwif, &hw); |