Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[SCSI] hpsa: interrupt pending function should return bool not unsigned long

Browse source 
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Stephen M. Cameron 2010-02-04 08:42:35 -06:00 • committed by James Bottomley
parent 84ca0be2a2
commit 900c54404a
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/scsi/hpsa.c
View file

@ -2693,7 +2693,7 @@ static inline unsigned long get_next_completion(struct ctlr_info *h)
return h->access.command_completed(h); return h->access.command_completed(h);
} }
static inline int interrupt_pending(struct ctlr_info *h) static inline bool interrupt_pending(struct ctlr_info *h)
{ {
return h->access.intr_pending(h); return h->access.intr_pending(h);
} }

8
drivers/scsi/hpsa.h
View file

@ -33,7 +33,7 @@ struct access_method {
struct CommandList *c); struct CommandList *c);
void (*set_intr_mask)(struct ctlr_info *h, unsigned long val); void (*set_intr_mask)(struct ctlr_info *h, unsigned long val);
unsigned long (*fifo_full)(struct ctlr_info *h); unsigned long (*fifo_full)(struct ctlr_info *h);
unsigned long (*intr_pending)(struct ctlr_info *h); bool (*intr_pending)(struct ctlr_info *h);
unsigned long (*command_completed)(struct ctlr_info *h); unsigned long (*command_completed)(struct ctlr_info *h);
}; };
@ -233,14 +233,12 @@ static unsigned long SA5_completed(struct ctlr_info *h)
/* /*
* Returns true if an interrupt is pending.. * Returns true if an interrupt is pending..
*/ */
static unsigned long SA5_intr_pending(struct ctlr_info *h) static bool SA5_intr_pending(struct ctlr_info *h)
{ {
unsigned long register_value = unsigned long register_value =
readl(h->vaddr + SA5_INTR_STATUS); readl(h->vaddr + SA5_INTR_STATUS);
dev_dbg(&h->pdev->dev, "intr_pending %lx\n", register_value); dev_dbg(&h->pdev->dev, "intr_pending %lx\n", register_value);
if (register_value & SA5_INTR_PENDING) return register_value & SA5_INTR_PENDING;
return 1;
return 0 ;
} }