diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-05-17 13:12:24 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-05-17 13:12:24 -0400 |
commit | dca3983059a4481e4ae97bbf0ac4b4c21429e1a5 (patch) | |
tree | ee15aed0673b5474bdadc93e3054f361bf2e839b /drivers/ide/ide-generic.c | |
parent | 29e52cf793ded6bece50de50e738596f94f07d9f (diff) |
ide: pass number of ports to ide_host_{alloc,add}() (v2)
Pass number of ports to ide_host_{alloc,add}() and then update
all users accordingly.
v2:
- drop no longer needed NULL initializers in buddha.c, cmd640.c and gayle.c
(noticed by Sergei)
There should be no functional changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-generic.c')
-rw-r--r-- | drivers/ide/ide-generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c index 0427759d0187..0d40848540d4 100644 --- a/drivers/ide/ide-generic.c +++ b/drivers/ide/ide-generic.c | |||
@@ -86,7 +86,7 @@ static void ide_generic_check_pci_legacy_iobases(int *primary, int *secondary) | |||
86 | 86 | ||
87 | static int __init ide_generic_init(void) | 87 | static int __init ide_generic_init(void) |
88 | { | 88 | { |
89 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; | 89 | hw_regs_t hw, *hws[] = { &hw }; |
90 | unsigned long io_addr; | 90 | unsigned long io_addr; |
91 | int i, rc = 0, primary = 0, secondary = 0; | 91 | int i, rc = 0, primary = 0, secondary = 0; |
92 | 92 | ||
@@ -133,7 +133,7 @@ static int __init ide_generic_init(void) | |||
133 | #else | 133 | #else |
134 | hw.irq = legacy_irqs[i]; | 134 | hw.irq = legacy_irqs[i]; |
135 | #endif | 135 | #endif |
136 | rc = ide_host_add(&ide_generic_port_info, hws, NULL); | 136 | rc = ide_host_add(&ide_generic_port_info, hws, 1, NULL); |
137 | if (rc) { | 137 | if (rc) { |
138 | release_region(io_addr + 0x206, 1); | 138 | release_region(io_addr + 0x206, 1); |
139 | release_region(io_addr, 8); | 139 | release_region(io_addr, 8); |