diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-19 18:32:31 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-19 18:32:31 -0400 |
commit | 8447d9d52adbe4c653482bd0d5ccb9b5d26f9c9d (patch) | |
tree | 358aa3ca6b0657623b84e7c6278f90fc95a32879 /drivers/ide/arm | |
parent | fd9bb53942a7ca3398a63f2c238afd8fbed3ec0e (diff) |
ide: add ide_device_add()
* Add ide_device_add() helper and convert host drivers to use it
instead of open-coded variants.
* Make ide_pci_setup_ports() and do_ide_setup_pci_device()
take 'u8 *idx' argument instead of 'ata_index_t *index'.
* Remove no longer needed ata_index_t.
* Unexport probe_hwif_init() and make it static.
* Unexport ide_proc_register_port().
There should be no functionality changes caused by this patch
(sgiioc4.c: ide_proc_register_port() requires hwif->present
to be set and it won't be set if probe_hwif_init() fails).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/arm')
-rw-r--r-- | drivers/ide/arm/icside.c | 13 | ||||
-rw-r--r-- | drivers/ide/arm/rapide.c | 8 |
2 files changed, 13 insertions, 8 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c index 3af33fbf1f88..6298932c0589 100644 --- a/drivers/ide/arm/icside.c +++ b/drivers/ide/arm/icside.c | |||
@@ -500,6 +500,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec) | |||
500 | { | 500 | { |
501 | ide_hwif_t *hwif; | 501 | ide_hwif_t *hwif; |
502 | void __iomem *base; | 502 | void __iomem *base; |
503 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | ||
503 | 504 | ||
504 | base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0); | 505 | base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0); |
505 | if (!base) | 506 | if (!base) |
@@ -523,9 +524,9 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec) | |||
523 | 524 | ||
524 | state->hwif[0] = hwif; | 525 | state->hwif[0] = hwif; |
525 | 526 | ||
526 | probe_hwif_init(hwif); | 527 | idx[0] = hwif->index; |
527 | 528 | ||
528 | ide_proc_register_port(hwif); | 529 | ide_device_add(idx); |
529 | 530 | ||
530 | return 0; | 531 | return 0; |
531 | } | 532 | } |
@@ -537,6 +538,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) | |||
537 | void __iomem *ioc_base, *easi_base; | 538 | void __iomem *ioc_base, *easi_base; |
538 | unsigned int sel = 0; | 539 | unsigned int sel = 0; |
539 | int ret; | 540 | int ret; |
541 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | ||
540 | 542 | ||
541 | ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0); | 543 | ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0); |
542 | if (!ioc_base) { | 544 | if (!ioc_base) { |
@@ -608,11 +610,10 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) | |||
608 | icside_dma_init(mate); | 610 | icside_dma_init(mate); |
609 | } | 611 | } |
610 | 612 | ||
611 | probe_hwif_init(hwif); | 613 | idx[0] = hwif->index; |
612 | probe_hwif_init(mate); | 614 | idx[1] = mate->index; |
613 | 615 | ||
614 | ide_proc_register_port(hwif); | 616 | ide_device_add(idx); |
615 | ide_proc_register_port(mate); | ||
616 | 617 | ||
617 | return 0; | 618 | return 0; |
618 | 619 | ||
diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c index 83811af11610..6d2fe21cd729 100644 --- a/drivers/ide/arm/rapide.c +++ b/drivers/ide/arm/rapide.c | |||
@@ -58,6 +58,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
58 | ide_hwif_t *hwif; | 58 | ide_hwif_t *hwif; |
59 | void __iomem *base; | 59 | void __iomem *base; |
60 | int ret; | 60 | int ret; |
61 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | ||
61 | 62 | ||
62 | ret = ecard_request_resources(ec); | 63 | ret = ecard_request_resources(ec); |
63 | if (ret) | 64 | if (ret) |
@@ -74,8 +75,11 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
74 | hwif->hwif_data = base; | 75 | hwif->hwif_data = base; |
75 | hwif->gendev.parent = &ec->dev; | 76 | hwif->gendev.parent = &ec->dev; |
76 | hwif->noprobe = 0; | 77 | hwif->noprobe = 0; |
77 | probe_hwif_init(hwif); | 78 | |
78 | ide_proc_register_port(hwif); | 79 | idx[0] = hwif->index; |
80 | |||
81 | ide_device_add(idx); | ||
82 | |||
79 | ecard_set_drvdata(ec, hwif); | 83 | ecard_set_drvdata(ec, hwif); |
80 | goto out; | 84 | goto out; |
81 | } | 85 | } |