Re: [PATCH 25/64] ide: use standard timing for XFER_PIO_SLOW modein ide_timing_compute()

[Sergei Shtylyov]

Hello.

Bartlomiej Zolnierkiewicz wrote:

> > > From: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
> > > Subject: [PATCH] ide: use standard timing for XFER_PIO_SLOW mode in ide_timing_compute()
> > >
> > > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
> > >       
> > Applied.
> >     
>
> Thanks.
>
> Here is a bonus fixup for a small issue noticed by Sergei yesterday.
>
> From: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
> Subject: [PATCH] ide: ide_timing_compute() fixup
>
> XFER_SW_DMA_0 mode should be excluded from the extended cycle
> timing computations.
>
> [ This is just a documentation fix -- code inside the affected
>   'if' block already makes sure to accept only PIO modes. ]
>
> Noticed-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
> ---
>  drivers/ide/ide-timings.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: b/drivers/ide/ide-timings.c
> ===================================================================
> --- a/drivers/ide/ide-timings.c
> +++ b/drivers/ide/ide-timings.c
> @@ -166,7 +166,7 @@ int ide_timing_compute(ide_drive_t *driv
>  	if (id[ATA_ID_FIELD_VALID] & 2) {	/* EIDE drive */
>  		memset(&p, 0, sizeof(p));
>  
> -		if (speed >= XFER_PIO_0 && speed <= XFER_SW_DMA_0) {
> +		if (speed >= XFER_PIO_0 && speed < XFER_SW_DMA_0) {
>  			if (speed <= XFER_PIO_2)
>  				p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO];
>  			else if ((speed <= XFER_PIO_4) ||
>   

  But shouldn't this just be merged to "ide: use standard timing for 
XFER_PIO_SLOW mode in ide_timing_compute()" since it's the patch that 
introduced that check?

MBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/