Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 900c5440 authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by James Bottomley
Browse files

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



Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 84ca0be2

drivers/scsi/hpsa.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

drivers/scsi/hpsa.h

+3 −5
Original line number Diff line number Diff line
@@ -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;

}