diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 19:56:43 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 19:56:43 +0100 |
| commit | d9270a3f1d5b6f9de58250e8ecdba4c48c54c20b (patch) | |
| tree | 777f519f513035c23e36890357e608e0581edcde | |
| parent | 327617e1da15c3f04bfc50018b0319bd40849022 (diff) | |
| download | linux-3.10-d9270a3f1d5b6f9de58250e8ecdba4c48c54c20b.tar.gz linux-3.10-d9270a3f1d5b6f9de58250e8ecdba4c48c54c20b.tar.bz2 linux-3.10-d9270a3f1d5b6f9de58250e8ecdba4c48c54c20b.zip | |
ide: move create_proc_ide_drives() call to ide_device_add_all()
* Un-static create_proc_ide_drives() and call it from ide_device_add_all().
While at it:
* Rename create_proc_ide_drives() to ide_proc_port_register_devices().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| -rw-r--r-- | drivers/ide/ide-probe.c | 4 | ||||
| -rw-r--r-- | drivers/ide/ide-proc.c | 4 | ||||
| -rw-r--r-- | include/linux/ide.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 1ef29375704..c8d533a1015 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -1453,8 +1453,10 @@ int ide_device_add_all(u8 *idx, const struct ide_port_info *d) hwif = &ide_hwifs[idx[i]]; - if (hwif->present) + if (hwif->present) { ide_proc_register_port(hwif); + ide_proc_port_register_devices(hwif); + } } return rc; diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c index c6ed84b84e8..975c0ff0f43 100644 --- a/drivers/ide/ide-proc.c +++ b/drivers/ide/ide-proc.c @@ -739,7 +739,7 @@ void ide_proc_unregister_driver(ide_drive_t *drive, ide_driver_t *driver) EXPORT_SYMBOL(ide_proc_unregister_driver); -static void create_proc_ide_drives(ide_hwif_t *hwif) +void ide_proc_port_register_devices(ide_hwif_t *hwif) { int d; struct proc_dir_entry *ent; @@ -801,8 +801,6 @@ void ide_proc_register_port(ide_hwif_t *hwif) ide_add_proc_entries(hwif->proc, hwif_entries, hwif); } - - create_proc_ide_drives(hwif); } #ifdef CONFIG_BLK_DEV_IDEPCI diff --git a/include/linux/ide.h b/include/linux/ide.h index e33e307d941..70209148ef5 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -715,6 +715,7 @@ typedef struct { void proc_ide_create(void); void proc_ide_destroy(void); void ide_proc_register_port(ide_hwif_t *); +void ide_proc_port_register_devices(ide_hwif_t *); void ide_proc_unregister_port(ide_hwif_t *); void ide_proc_register_driver(ide_drive_t *, ide_driver_t *); void ide_proc_unregister_driver(ide_drive_t *, ide_driver_t *); @@ -747,6 +748,7 @@ void ide_pci_create_host_proc(const char *, get_info_t *); static inline void proc_ide_create(void) { ; } static inline void proc_ide_destroy(void) { ; } static inline void ide_proc_register_port(ide_hwif_t *hwif) { ; } +static inline void ide_proc_port_register_devices(ide_hwif_t *hwif) { ; } static inline void ide_proc_unregister_port(ide_hwif_t *hwif) { ; } static inline void ide_proc_register_driver(ide_drive_t *drive, ide_driver_t *driver) { ; } static inline void ide_proc_unregister_driver(ide_drive_t *drive, ide_driver_t *driver) { ; } |