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

[Roel Kluin <roel.kluin@gmail.com>]

Bartlomiej Zolnierkiewicz wrote:
> On Monday 02 March 2009, Sergei Shtylyov wrote:
>> Roel Kluin 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?
> 
> [ 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.
> 
> Thanks,
> Bart

I'm a little confused, do you want wait to be int, as my patch does below,
or do you want the typedef to be:

typedef unsigned long (ide_expiry_t)(ide_drive_t *);

If the latter, I think the functions that expiry points to have to be adapted as
well, right?

this is against tip-latest, feel free to modify the changelog.
------------------------------>8-------------8<---------------------------------
expiry() returns int, negative expiry() return values won't be noticed.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index cc35d6d..0715692 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1190,7 +1190,7 @@ void ide_timer_expiry (unsigned long data)
 	ide_handler_t	*handler;
 	ide_expiry_t	*expiry;
 	unsigned long	flags;
-	unsigned long	wait = -1;
+	int		wait = -1;
 
 	spin_lock_irqsave(&ide_lock, flags);