[PATCH 7/21] ide-cris: don't override ide_register_hw() result

[PATCH 7/21] ide-cris: don't override ide_register_hw() result

[Bartlomiej Zolnierkiewicz]

* Don't override ide_register_hw() result and check if there is a hwif
  available to use.

* MAX_HWIFS is user configurable nowadays so replace it by hard-coded value.

* Remove the comment about ide_hwifs[].

Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/cris/ide-cris.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Index: b/drivers/ide/cris/ide-cris.c
===================================================================
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -770,15 +770,16 @@ init_e100_ide (void)
 	/* the IDE control register is at ATA address 6, with CS1 active instead of CS0 */
 	ide_offsets[IDE_CONTROL_OFFSET] = cris_ide_reg_addr(6, 1, 0);
 
-	/* first fill in some stuff in the ide_hwifs fields */
+	for (h = 0; h < 4; h++) {
+		ide_hwif_t *hwif = NULL;
 
-	for(h = 0; h < MAX_HWIFS; h++) {
-		ide_hwif_t *hwif = &ide_hwifs[h];
 		ide_setup_ports(&hw, cris_ide_base_address(h),
 		                ide_offsets,
 		                0, 0, cris_ide_ack_intr,
 		                ide_default_irq(0));
 		ide_register_hw(&hw, NULL, 1, &hwif);
+		if (hwif == NULL)
+			continue;
 		hwif->mmio = 1;
 		hwif->chipset = ide_etrax100;
 		hwif->set_pio_mode = &cris_set_pio_mode;

Re: [PATCH 7/21] ide-cris: don't override ide_register_hw() result

[Sergei Shtylyov]

Bartlomiej Zolnierkiewicz wrote:

> * Don't override ide_register_hw() result and check if there is a hwif
>   available to use.

> * MAX_HWIFS is user configurable nowadays so replace it by hard-coded value.

> * Remove the comment about ide_hwifs[].

> Cc: Mikael Starvik <starvik@axis.com>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

MBR, Sergei

RE: [PATCH 7/21] ide-cris: don't override ide_register_hw() result

[Mikael Starvik]

Acked-by: Mikael Starvik <starvik@axis.com>

-----Original Message-----
From: Sergei Shtylyov [mailto:sshtylyov@ru.mvista.com] 
Sent: Tuesday, November 27, 2007 1:58 PM
To: Bartlomiej Zolnierkiewicz
Cc: linux-ide@vger.kernel.org; Mikael Starvik
Subject: Re: [PATCH 7/21] ide-cris: don't override ide_register_hw() result


Bartlomiej Zolnierkiewicz wrote:

> * Don't override ide_register_hw() result and check if there is a hwif
>   available to use.

> * MAX_HWIFS is user configurable nowadays so replace it by hard-coded
value.

> * Remove the comment about ide_hwifs[].

> Cc: Mikael Starvik <starvik@axis.com>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

MBR, Sergei