diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-02-04 08:42:35 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-02-17 13:19:52 -0600 |
| commit | 900c54404a9456b3ff10745e5e8f64b12c3a6ef7 (patch) | |
| tree | 44a6372391cb24f0414141f775d15c93b26ee08c | |
| parent | 84ca0be2a2cd9730683310b831db9d2fa60b3b0b (diff) | |
[SCSI] hpsa: interrupt pending function should return bool not unsigned long
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
| -rw-r--r-- | drivers/scsi/hpsa.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/hpsa.h | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 82987e1850a..314854b455d 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -2693,7 +2693,7 @@ static inline unsigned long get_next_completion(struct ctlr_info *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); } diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h index cdac95b0e65..0eab386a03b 100644 --- a/drivers/scsi/hpsa.h +++ b/drivers/scsi/hpsa.h @@ -33,7 +33,7 @@ struct access_method { struct CommandList *c); void (*set_intr_mask)(struct ctlr_info *h, unsigned long val); 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); }; @@ -233,14 +233,12 @@ static unsigned long SA5_completed(struct ctlr_info *h) /* * 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 = readl(h->vaddr + SA5_INTR_STATUS); dev_dbg(&h->pdev->dev, "intr_pending %lx\n", register_value); - if (register_value & SA5_INTR_PENDING) - return 1; - return 0 ; + return register_value & SA5_INTR_PENDING; } |