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>
This commit is contained in:
@@ -39,6 +39,8 @@
|
||||
|
||||
#include <asm/io.h>
|
||||
|
||||
static struct proc_dir_entry *proc_ide_root;
|
||||
|
||||
static int proc_ide_read_imodel
|
||||
(char *page, char **start, off_t off, int count, int *eof, void *data)
|
||||
{
|
||||
@@ -783,26 +785,24 @@ static ide_proc_entry_t hwif_entries[] = {
|
||||
{ NULL, 0, NULL, NULL }
|
||||
};
|
||||
|
||||
void create_proc_ide_interfaces(void)
|
||||
void ide_proc_register_port(ide_hwif_t *hwif)
|
||||
{
|
||||
int h;
|
||||
if (!hwif->present)
|
||||
return;
|
||||
|
||||
for (h = 0; h < MAX_HWIFS; h++) {
|
||||
ide_hwif_t *hwif = &ide_hwifs[h];
|
||||
if (!hwif->proc) {
|
||||
hwif->proc = proc_mkdir(hwif->name, proc_ide_root);
|
||||
|
||||
if (!hwif->present)
|
||||
continue;
|
||||
if (!hwif->proc) {
|
||||
hwif->proc = proc_mkdir(hwif->name, proc_ide_root);
|
||||
if (!hwif->proc)
|
||||
return;
|
||||
ide_add_proc_entries(hwif->proc, hwif_entries, hwif);
|
||||
}
|
||||
create_proc_ide_drives(hwif);
|
||||
if (!hwif->proc)
|
||||
return;
|
||||
|
||||
ide_add_proc_entries(hwif->proc, hwif_entries, hwif);
|
||||
}
|
||||
|
||||
create_proc_ide_drives(hwif);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(create_proc_ide_interfaces);
|
||||
EXPORT_SYMBOL_GPL(ide_proc_register_port);
|
||||
|
||||
#ifdef CONFIG_BLK_DEV_IDEPCI
|
||||
void ide_pci_create_host_proc(const char *name, get_info_t *get_info)
|
||||
@@ -813,7 +813,7 @@ void ide_pci_create_host_proc(const char *name, get_info_t *get_info)
|
||||
EXPORT_SYMBOL_GPL(ide_pci_create_host_proc);
|
||||
#endif
|
||||
|
||||
void destroy_proc_ide_interface(ide_hwif_t *hwif)
|
||||
void ide_proc_unregister_port(ide_hwif_t *hwif)
|
||||
{
|
||||
if (hwif->proc) {
|
||||
destroy_proc_ide_drives(hwif);
|
||||
@@ -860,11 +860,11 @@ void proc_ide_create(void)
|
||||
{
|
||||
struct proc_dir_entry *entry;
|
||||
|
||||
proc_ide_root = proc_mkdir("ide", NULL);
|
||||
|
||||
if (!proc_ide_root)
|
||||
return;
|
||||
|
||||
create_proc_ide_interfaces();
|
||||
|
||||
entry = create_proc_entry("drivers", 0, proc_ide_root);
|
||||
if (entry)
|
||||
entry->proc_fops = &ide_drivers_operations;
|
||||
|
Reference in New Issue
Block a user