diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-05-09 18:01:11 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-05-09 18:01:11 -0400 |
commit | 5cbf79cdb37be2aa2a1b4fa94144526b14557060 (patch) | |
tree | 1fcfbc1248b9904e5890cc593f018ee0a8a53238 /drivers/ide/arm | |
parent | 869c56ee9de1b72cd3f8ab9cdfbd3601e55c61f2 (diff) |
ide: add ide_proc_register_port()
* create_proc_ide_interfaces() tries to add /proc entries for every probed
and initialized IDE port, replace it by ide_proc_register_port() which does
it only for the given port (also rename destroy_proc_ide_interface() to
ide_proc_unregister_port() for consistency)
* convert {create,destroy}_proc_ide_interface[s]() users to use new functions
* pmac driver depended on proc_ide_create() to add /proc port entries, fix it
* au1xxx-ide, swarm and cs5520 drivers depended indirectly on ide-generic
driver (CONFIG_IDE_GENERIC=y) to add port /proc entries, fix them
* there is now no need to add /proc entries for IDE ports in proc_ide_create()
so don't do it
* proc_ide_create() needs now to be called before drivers are probed - fix it,
while at it make proc_ide_create() create /proc "ide" directory
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/arm')
-rw-r--r-- | drivers/ide/arm/icside.c | 7 | ||||
-rw-r--r-- | drivers/ide/arm/rapide.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c index f383ace2a087..1fe0457243db 100644 --- a/drivers/ide/arm/icside.c +++ b/drivers/ide/arm/icside.c | |||
@@ -591,7 +591,8 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec) | |||
591 | state->hwif[0] = hwif; | 591 | state->hwif[0] = hwif; |
592 | 592 | ||
593 | probe_hwif_init(hwif); | 593 | probe_hwif_init(hwif); |
594 | create_proc_ide_interfaces(); | 594 | |
595 | ide_proc_register_port(hwif); | ||
595 | 596 | ||
596 | return 0; | 597 | return 0; |
597 | } | 598 | } |
@@ -679,7 +680,9 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) | |||
679 | 680 | ||
680 | probe_hwif_init(hwif); | 681 | probe_hwif_init(hwif); |
681 | probe_hwif_init(mate); | 682 | probe_hwif_init(mate); |
682 | create_proc_ide_interfaces(); | 683 | |
684 | ide_proc_register_port(hwif); | ||
685 | ide_proc_register_port(mate); | ||
683 | 686 | ||
684 | return 0; | 687 | return 0; |
685 | 688 | ||
diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c index 9c6c49fdd2b1..890ea3fac3c6 100644 --- a/drivers/ide/arm/rapide.c +++ b/drivers/ide/arm/rapide.c | |||
@@ -76,7 +76,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
76 | hwif->gendev.parent = &ec->dev; | 76 | hwif->gendev.parent = &ec->dev; |
77 | hwif->noprobe = 0; | 77 | hwif->noprobe = 0; |
78 | probe_hwif_init(hwif); | 78 | probe_hwif_init(hwif); |
79 | create_proc_ide_interfaces(); | 79 | ide_proc_register_port(hwif); |
80 | ecard_set_drvdata(ec, hwif); | 80 | ecard_set_drvdata(ec, hwif); |
81 | goto out; | 81 | goto out; |
82 | } | 82 | } |