[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>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 82987e1850a16f16e22c96ef53608c0b03d9097b..314854b455d26aaaa3cf1a68016ff960db89dd50 100644 (file)
--- 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 cdac95b0e65f9630d3306bee4d28c38678a07ffc..0eab386a03be1acf4f1e6fb5d0e009ac0804febe 100644 (file)
--- 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;
 }