Re: [PATCH 4/6] ide: add ide_busy_sleep() helper

[Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>]

Hi,

On Tuesday 04 December 2007, Sergei Shtylyov wrote:
> Bartlomiej Zolnierkiewicz wrote:
> 
> > Add ide_busy_sleep() helper and use it in do_probe(),
> > enable_nest() and probe_hwif().
> 
> > As a nice side-effect this fixes a minor bug in enable_nest()
> > (the code was reading status register without any delay).
> 
>     Huh?
> 
> > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> 
> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
> 
> > Index: b/drivers/ide/ide-probe.c
> > ===================================================================
> > --- a/drivers/ide/ide-probe.c
> > +++ b/drivers/ide/ide-probe.c
> [...]
> > @@ -489,20 +499,16 @@ static int do_probe (ide_drive_t *drive,
> >  static void enable_nest (ide_drive_t *drive)
> >  {
> >  	ide_hwif_t *hwif = HWIF(drive);
> > -	unsigned long timeout;
> >  
> >  	printk("%s: enabling %s -- ", hwif->name, drive->id->model);
> >  	SELECT_DRIVE(drive);
> >  	msleep(50);
> >  	hwif->OUTB(EXABYTE_ENABLE_NEST, IDE_COMMAND_REG);
> > -	timeout = jiffies + WAIT_WORSTCASE;
> > -	do {
> > -		if (time_after(jiffies, timeout)) {
> > -			printk("failed (timeout)\n");
> > -			return;
> > -		}
> > -		msleep(50);
> 
>     Here's a delay, isn't it?

s/enable_nest/do_probe/

Thanks for pointing this out, I fixed patch description locally.

> > -	} while ((hwif->INB(IDE_STATUS_REG)) & BUSY_STAT);
> > +
> > +	if (ide_busy_sleep(hwif)) {
> > +		printk(KERN_CONT "failed (timeout)\n");
> > +		return;
> > +	}
> >  
> >  	msleep(50);