Re: ide_timer_expiry() - shouldn't 'wait' be int?

[Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>]

On Monday 02 March 2009, Sergei Shtylyov wrote:
> Hello.
> 
> Bartlomiej Zolnierkiewicz wrote:
> 
> >>>vi drivers/ide/ide-io.c +906 and note:
> 
> >>>void ide_timer_expiry (unsigned long data)
> >>>{
> >>>	ide_expiry_t *expiry = hwif->expiry;
> >>>	...
> >>>	unsigned long   wait = -1;
> 
> >>    Hm, haven't nothiced that this is *unsigned*.
> 
> >>>		...
> >>>		if (expiry) {
> >>>			...
> >>>			wait = expiry(drive);
> >>>			if (wait > 0) { /* continue */
> >>
> >>>also note that in include/linux/ide.h:883:
> 
> >>>typedef int (ide_expiry_t)(ide_drive_t *);
> 
> >>>doesn't this mean that expiry returns int, and wait therefore should
> >>>be int as well?
> 
> >>    It rather means that ide_expiry_t() should return unsigned.
> 
> > Seconded.  Roel, could you also handle it?
> 
>     Not worth it, IMO...
> 
> > [ However since this is 2.6.30 stuff and there has been much work in
> >   this area recently please base in top of linux-next or pata-2.6 tree. ]
> 
> >>    However, you're right as ide_dma_timeout_retry() takes *int* as a 2nd 
> >>argument.
> 
> > Though it works fine (by a luck :) we should also fix it while we're at it.
> 
>     Fix what?

ide_dma_timeout_retry's argument -- it is not the error value that we want to
pass but the timeout value.