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/pmac.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/pmac.c')
-rw-r--r-- | drivers/ide/pmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c index f76e4e6b408f..f4f806476e0a 100644 --- a/drivers/ide/pmac.c +++ b/drivers/ide/pmac.c | |||
@@ -1029,7 +1029,7 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, hw_regs_t *hw) | |||
1029 | const int *bidp; | 1029 | const int *bidp; |
1030 | struct ide_host *host; | 1030 | struct ide_host *host; |
1031 | ide_hwif_t *hwif; | 1031 | ide_hwif_t *hwif; |
1032 | hw_regs_t *hws[] = { hw, NULL, NULL, NULL }; | 1032 | hw_regs_t *hws[] = { hw }; |
1033 | struct ide_port_info d = pmac_port_info; | 1033 | struct ide_port_info d = pmac_port_info; |
1034 | int rc; | 1034 | int rc; |
1035 | 1035 | ||
@@ -1077,7 +1077,7 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, hw_regs_t *hw) | |||
1077 | /* Make sure we have sane timings */ | 1077 | /* Make sure we have sane timings */ |
1078 | sanitize_timings(pmif); | 1078 | sanitize_timings(pmif); |
1079 | 1079 | ||
1080 | host = ide_host_alloc(&d, hws); | 1080 | host = ide_host_alloc(&d, hws, 1); |
1081 | if (host == NULL) | 1081 | if (host == NULL) |
1082 | return -ENOMEM; | 1082 | return -ENOMEM; |
1083 | hwif = host->ports[0]; | 1083 | hwif = host->ports[0]; |