[PATCH 22/22] ide: move create_proc_ide_drives() call to ide_device_add_all()

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <linux-ide@...>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@...>, <linux-kernel@...>
Date: Wednesday, January 16, 2008 - 7:28 pm

* 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>
---
 drivers/ide/ide-probe.c |    4 +++-
 drivers/ide/ide-proc.c  |    4 +---
 include/linux/ide.h     |    2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

Index: b/drivers/ide/ide-probe.c
===================================================================
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1453,8 +1453,10 @@ int ide_device_add_all(u8 idx[MAX_HWIFS]
 
 		hwif = &ide_hwifs[idx[i]];
 
-		if (hwif->present)
+		if (hwif->present) {
 			ide_proc_register_port(hwif);
+			ide_proc_port_register_devices(hwif);
+		}
 	}
 
 	return rc;
Index: b/drivers/ide/ide-proc.c
===================================================================
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -739,7 +739,7 @@ void ide_proc_unregister_driver(ide_driv
 
 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 *
 
 		ide_add_proc_entries(hwif->proc, hwif_entries, hwif);
 	}
-
-	create_proc_ide_drives(hwif);
 }
 
 #ifdef CONFIG_BLK_DEV_IDEPCI
Index: b/include/linux/ide.h
===================================================================
--- 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
 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) { ; }
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/22] ide: even more IDE probing code rework, Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:25 pm)
[PATCH 22/22] ide: move create_proc_ide_drives() call to ide..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:28 pm)
[PATCH 21/22] ide: move hwif-&gt;present check out from ide_..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:28 pm)
[PATCH 20/22] ide: factor out devices setup from ide_acpi_in..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:28 pm)
[PATCH 19/22] ide-acpi: remove dead code from do_drive_get_G..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:28 pm)
[PATCH 15/22] ide: factor out adding drive to hwgroup from i..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 18/22] ide-acpi: remove needless exports, Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:28 pm)
[PATCH 17/22] ide: move ide_acpi_init() call to ide_device_a..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:28 pm)
[PATCH 16/22] ide: factor out devices setup from init_irq(), Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 14/22] ide: move hwif-&gt;rqsize init from ide_init_q..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 13/22] ide: merge init_gendisk() into hwif_register_d..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 12/22] ide: call init_gendisk() after ide_acpi_init(), Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 11/22] ide: move blk_register_region() call out from ..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 10/22] ide: skip not present devices in init_gendisk(), Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 09/22] ide: remove incorrect init_gendisk() comment, Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 08/22] ide: add -&gt;init_port_devs method to ide_hwif_t, Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 07/22] ide: add IDE_HFLAG_NO_{IO32_BIT,UNMASK_IRQS} h..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:26 pm)
[PATCH 06/22] ide: factor out code initializing devices from..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:26 pm)
[PATCH 05/22] ide: fix ide_unregister() usage in host drivers, Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:26 pm)
[PATCH 04/22] ide: add ide_deprecated_find_port() helper, Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:26 pm)
Re: [PATCH 04/22] ide: add ide_deprecated_find_port() helper, Sergei Shtylyov, (Wed May 21, 10:29 am)
Re: [PATCH 04/22] ide: add ide_deprecated_find_port() helper, Bartlomiej Zolnierkiewicz..., (Tue May 27, 2:36 pm)
[PATCH 03/22] ide: add 'init_default' and 'restore' argument..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:26 pm)
[PATCH 02/22] ide: remove redundant init_hwif_default() call..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:26 pm)
[PATCH 01/22] ide: remove redundant hwif-&gt;present check f..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:26 pm)