diff options
author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-02-04 09:42:35 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-02-17 14:19:52 -0500 |
commit | 900c54404a9456b3ff10745e5e8f64b12c3a6ef7 (patch) | |
tree | 44a6372391cb24f0414141f775d15c93b26ee08c /drivers/scsi/hpsa.h | |
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>
Diffstat (limited to 'drivers/scsi/hpsa.h')
-rw-r--r-- | drivers/scsi/hpsa.h | 8 |
1 files changed, 3 insertions, 5 deletions
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 { | |||
33 | struct CommandList *c); | 33 | struct CommandList *c); |
34 | void (*set_intr_mask)(struct ctlr_info *h, unsigned long val); | 34 | void (*set_intr_mask)(struct ctlr_info *h, unsigned long val); |
35 | unsigned long (*fifo_full)(struct ctlr_info *h); | 35 | unsigned long (*fifo_full)(struct ctlr_info *h); |
36 | unsigned long (*intr_pending)(struct ctlr_info *h); | 36 | bool (*intr_pending)(struct ctlr_info *h); |
37 | unsigned long (*command_completed)(struct ctlr_info *h); | 37 | unsigned long (*command_completed)(struct ctlr_info *h); |
38 | }; | 38 | }; |
39 | 39 | ||
@@ -233,14 +233,12 @@ static unsigned long SA5_completed(struct ctlr_info *h) | |||
233 | /* | 233 | /* |
234 | * Returns true if an interrupt is pending.. | 234 | * Returns true if an interrupt is pending.. |
235 | */ | 235 | */ |
236 | static unsigned long SA5_intr_pending(struct ctlr_info *h) | 236 | static bool SA5_intr_pending(struct ctlr_info *h) |
237 | { | 237 | { |
238 | unsigned long register_value = | 238 | unsigned long register_value = |
239 | readl(h->vaddr + SA5_INTR_STATUS); | 239 | readl(h->vaddr + SA5_INTR_STATUS); |
240 | dev_dbg(&h->pdev->dev, "intr_pending %lx\n", register_value); | 240 | dev_dbg(&h->pdev->dev, "intr_pending %lx\n", register_value); |
241 | if (register_value & SA5_INTR_PENDING) | 241 | return register_value & SA5_INTR_PENDING; |
242 | return 1; | ||
243 | return 0 ; | ||
244 | } | 242 | } |
245 | 243 | ||
246 | 244 | ||