| Message ID | 1349625374-12391-2-git-send-email-morpheus.ibis@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Sun, Oct 07, 2012 at 05:56:05AM -0000, Pavel Herrmann wrote: > There is no difference in codepath with CONFIG_SC3 enabled, so just remove it > > Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com> This, and the rest of the series (with v2 for 2, 4, 7 and 8) has been applied to u-boot/master, thanks!
diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 6e1e568..4b94e23 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -400,9 +400,6 @@ void ide_init(void) unsigned char c; int i, bus; -#if defined(CONFIG_SC3) - unsigned int ata_reset_time = ATA_RESET_TIME; -#endif #ifdef CONFIG_IDE_8xx_PCCARD extern int pcmcia_on(void); extern int ide_devices_found; /* Initialized in check_ide_device() */ @@ -502,11 +499,7 @@ void ide_init(void) c = ide_inb(dev, ATA_STATUS); i++; -#if defined(CONFIG_SC3) - if (i > (ata_reset_time * 100)) { -#else if (i > (ATA_RESET_TIME * 100)) { -#endif puts("** Timeout **\n"); /* LED's off */ ide_led((LED_IDE1 | LED_IDE2), 0);
There is no difference in codepath with CONFIG_SC3 enabled, so just remove it Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com> --- common/cmd_ide.c | 7 ------- 1 file changed, 7 deletions(-)