Re: [PATCH 6/15] ide: ide_find_best_pio_mode() fixes

[Sergei Shtylyov <sshtylyov@ru.mvista.com>]

Hello.

Bartlomiej Zolnierkiewicz wrote:
> * Check IORDY bit for PIO modes > 2.

> * Some devices claim maximum PIO mode > 2 in id->tPIO, they were punished too
>   severly for this by being limited to PIO_SLOW.  Limit them to PIO2 instead.

> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

    NAK. :-)

> Index: b/drivers/ide/ide-timing.h
> ===================================================================
> --- a/drivers/ide/ide-timing.h
> +++ b/drivers/ide/ide-timing.h
> @@ -111,16 +111,14 @@ static short ide_find_best_pio_mode(ide_
>  	struct hd_driveid *id = drive->id;
>  	short best = 0;
>  
> -	if (id->field_valid & 2) {	/* EIDE PIO modes */
> -
> +	/* EIDE PIO modes */
> +	if ((id->field_valid & 2) && (id->capability & 8)) {
>  		if ((best = (drive->id->eide_pio_modes & 4) ? XFER_PIO_5 :
>  			    (drive->id->eide_pio_modes & 2) ? XFER_PIO_4 :
>  			    (drive->id->eide_pio_modes & 1) ? XFER_PIO_3 : 0)) return best;
>  	}
> -	
> -	return  (drive->id->tPIO == 2) ? XFER_PIO_2 :
> -		(drive->id->tPIO == 1) ? XFER_PIO_1 :
> -		(drive->id->tPIO == 0) ? XFER_PIO_0 : XFER_PIO_SLOW;
> +
> +	return min_t(u8, id->tPIO, 2);

    XFER_PIO_[012] != [012], and otherwise you're returning XFER_PIO_* constants.

MBR, Sergei