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

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

[SCSI] hpsa: make tag macros into functions 



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

drivers/scsi/hpsa.c

+22 −4
Original line number Diff line number Diff line
@@ -2723,6 +2723,24 @@ static inline void finish_cmd(struct CommandList *c, u32 raw_tag) 
		complete(c->waiting);

}



static inline u32 hpsa_tag_contains_index(u32 tag)

{

#define DIRECT_LOOKUP_BIT 0x04

	return tag & DIRECT_LOOKUP_BIT;

}



static inline u32 hpsa_tag_to_index(u32 tag)

{

#define DIRECT_LOOKUP_SHIFT 3

	return tag >> DIRECT_LOOKUP_SHIFT;

}



static inline u32 hpsa_tag_discard_error_bits(u32 tag)

{

#define HPSA_ERROR_BITS 0x03

	return tag & ~HPSA_ERROR_BITS;

}



static irqreturn_t do_hpsa_intr(int irq, void *dev_id)

{

	struct ctlr_info *h = dev_id;
@@ -2736,15 +2754,15 @@ static irqreturn_t do_hpsa_intr(int irq, void *dev_id) 
	spin_lock_irqsave(&h->lock, flags);

	while (interrupt_pending(h)) {

		while ((raw_tag = get_next_completion(h)) != FIFO_EMPTY) {

			if (likely(HPSA_TAG_CONTAINS_INDEX(raw_tag))) {

				tag_index = HPSA_TAG_TO_INDEX(raw_tag);

			if (likely(hpsa_tag_contains_index(raw_tag))) {

				tag_index = hpsa_tag_to_index(raw_tag);

				if (bad_tag(h, tag_index, raw_tag))

					return IRQ_HANDLED;

				c = h->cmd_pool + tag_index;

				finish_cmd(c, raw_tag);

				continue;

			}

			tag = HPSA_TAG_DISCARD_ERROR_BITS(raw_tag);

			tag = hpsa_tag_discard_error_bits(raw_tag);

			c = NULL;

			hlist_for_each_entry(c, tmp, &h->cmpQ, list) {

				if (c->busaddr == tag) {
@@ -2824,7 +2842,7 @@ static __devinit int hpsa_message(struct pci_dev *pdev, unsigned char opcode, 


	for (i = 0; i < HPSA_MSG_SEND_RETRY_LIMIT; i++) {

		tag = readl(vaddr + SA5_REPLY_PORT_OFFSET);

		if (HPSA_TAG_DISCARD_ERROR_BITS(tag) == paddr32)

		if (hpsa_tag_discard_error_bits(tag) == paddr32)

			break;

		msleep(HPSA_MSG_SEND_RETRY_INTERVAL_MSECS);

	}

drivers/scsi/hpsa.h

+0 −3
Original line number Diff line number Diff line
@@ -164,9 +164,6 @@ struct ctlr_info { 
#define HPSA_FIRMWARE_READY	0xffff0000 /* value in scratchpad register */



#define HPSA_ERROR_BIT		0x02

#define HPSA_TAG_CONTAINS_INDEX(tag) ((tag) & 0x04)

#define HPSA_TAG_TO_INDEX(tag) ((tag) >> 3)

#define HPSA_TAG_DISCARD_ERROR_BITS(tag) ((tag) & ~3)



#define HPSA_INTR_ON 	1

#define HPSA_INTR_OFF	0