Re: [PATCH 07/18] ide: factor out devices init from ide_init_port_data()

2008-02-09 Thread Sergei Shtylyov

Bartlomiej Zolnierkiewicz wrote:


* Factor out devices init from ide_init_port_data() to
  ide_port_init_devices_data().



While at it:



* Add explicit clearing of IDE device structure.



There should be no functionality changes caused by this patch.



Signed-off-by: Bartlomiej Zolnierkiewicz [EMAIL PROTECTED]


Acked-by: Sergei Shtylyov [EMAIL PROTECTED]

MBR, Sergei
-
To unsubscribe from this list: send the line unsubscribe linux-ide in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 07/18] ide: factor out devices init from ide_init_port_data()

2008-02-07 Thread Bartlomiej Zolnierkiewicz
* Factor out devices init from ide_init_port_data() to
  ide_port_init_devices_data().

While at it:

* Add explicit clearing of IDE device structure.

There should be no functionality changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz [EMAIL PROTECTED]
---
 drivers/ide/ide.c |   23 +--
 1 file changed, 17 insertions(+), 6 deletions(-)

Index: b/drivers/ide/ide.c
===
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -109,13 +109,13 @@ ide_hwif_t ide_hwifs[MAX_HWIFS];  /* mast
 
 EXPORT_SYMBOL(ide_hwifs);
 
+static void ide_port_init_devices_data(ide_hwif_t *);
+
 /*
  * Do not even *think* about calling this!
  */
 void ide_init_port_data(ide_hwif_t *hwif, unsigned int index)
 {
-   unsigned int unit;
-
/* bulk initialize hwif  drive info with zeros */
memset(hwif, 0, sizeof(ide_hwif_t));
 
@@ -134,8 +134,20 @@ void ide_init_port_data(ide_hwif_t *hwif
 
default_hwif_iops(hwif);
default_hwif_transport(hwif);
+
+   ide_port_init_devices_data(hwif);
+}
+EXPORT_SYMBOL_GPL(ide_init_port_data);
+
+static void ide_port_init_devices_data(ide_hwif_t *hwif)
+{
+   int unit;
+
for (unit = 0; unit  MAX_DRIVES; ++unit) {
ide_drive_t *drive = hwif-drives[unit];
+   u8 j = (hwif-index * MAX_DRIVES) + unit;
+
+   memset(drive, 0, sizeof(*drive));
 
drive-media= ide_disk;
drive-select.all   = (unit4)|0xa0;
@@ -147,15 +159,14 @@ void ide_init_port_data(ide_hwif_t *hwif
drive-special.b.set_geometry   = 1;
drive-name[0]  = 'h';
drive-name[1]  = 'd';
-   drive-name[2]  = 'a' + (index * MAX_DRIVES) + 
unit;
+   drive-name[2]  = 'a' + j;
drive-max_failures = IDE_DEFAULT_MAX_FAILURES;
-   drive-using_dma= 0;
-   drive-vdma = 0;
+
INIT_LIST_HEAD(drive-list);
init_completion(drive-gendev_rel_comp);
}
 }
-EXPORT_SYMBOL_GPL(ide_init_port_data);
+
 
 static void init_hwif_default(ide_hwif_t *hwif, unsigned int index)
 {
-
To unsubscribe from this list: send the line unsubscribe linux-ide in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html