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 /include/linux | |
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 'include/linux')
-rw-r--r-- | include/linux/ide.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index bdb97655ef61..52d482a16dd9 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -909,12 +909,10 @@ typedef struct { | |||
909 | write_proc_t *write_proc; | 909 | write_proc_t *write_proc; |
910 | } ide_proc_entry_t; | 910 | } ide_proc_entry_t; |
911 | 911 | ||
912 | extern struct proc_dir_entry *proc_ide_root; | ||
913 | |||
914 | void proc_ide_create(void); | 912 | void proc_ide_create(void); |
915 | void proc_ide_destroy(void); | 913 | void proc_ide_destroy(void); |
916 | void create_proc_ide_interfaces(void); | 914 | void ide_proc_register_port(ide_hwif_t *); |
917 | void destroy_proc_ide_interface(ide_hwif_t *); | 915 | void ide_proc_unregister_port(ide_hwif_t *); |
918 | void ide_proc_register_driver(ide_drive_t *, ide_driver_t *); | 916 | void ide_proc_register_driver(ide_drive_t *, ide_driver_t *); |
919 | void ide_proc_unregister_driver(ide_drive_t *, ide_driver_t *); | 917 | void ide_proc_unregister_driver(ide_drive_t *, ide_driver_t *); |
920 | 918 | ||
@@ -945,8 +943,8 @@ void ide_pci_create_host_proc(const char *, get_info_t *); | |||
945 | #else | 943 | #else |
946 | static inline void proc_ide_create(void) { ; } | 944 | static inline void proc_ide_create(void) { ; } |
947 | static inline void proc_ide_destroy(void) { ; } | 945 | static inline void proc_ide_destroy(void) { ; } |
948 | static inline void create_proc_ide_interfaces(void) { ; } | 946 | static inline void ide_proc_register_port(ide_hwif_t *hwif) { ; } |
949 | static inline void destroy_proc_ide_interface(ide_hwif_t *hwif) { ; } | 947 | static inline void ide_proc_unregister_port(ide_hwif_t *hwif) { ; } |
950 | static inline void ide_proc_register_driver(ide_drive_t *drive, ide_driver_t *driver) { ; } | 948 | static inline void ide_proc_register_driver(ide_drive_t *drive, ide_driver_t *driver) { ; } |
951 | static inline void ide_proc_unregister_driver(ide_drive_t *drive, ide_driver_t *driver) { ; } | 949 | static inline void ide_proc_unregister_driver(ide_drive_t *drive, ide_driver_t *driver) { ; } |
952 | static inline void ide_add_generic_settings(ide_drive_t *drive) { ; } | 950 | static inline void ide_add_generic_settings(ide_drive_t *drive) { ; } |