Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 181327
b: refs/heads/master
c: 84ca0be
h: refs/heads/master
i:
  181325: d9624f9
  181323: 6ede3ce
  181319: 1cdb67a
  181311: bb53581
v: v3
  • Loading branch information
Stephen M. Cameron authored and James Bottomley committed Feb 17, 2010
1 parent 525de4e commit 0fb4bf3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a104c99f386191706a11d39be81b8f03cd4f2719
refs/heads/master: 84ca0be2a2cd9730683310b831db9d2fa60b3b0b
13 changes: 4 additions & 9 deletions trunk/drivers/scsi/hpsa.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,7 @@ struct ctlr_info {
static void SA5_submit_command(struct ctlr_info *h,
struct CommandList *c)
{
#ifdef HPSA_DEBUG
printk(KERN_WARNING "hpsa: Sending %x - down to controller\n",
c->busaddr);
#endif /* HPSA_DEBUG */
dev_dbg(&h->pdev->dev, "Sending %x\n", c->busaddr);
writel(c->busaddr, h->vaddr + SA5_REQUEST_PORT_OFFSET);
h->commands_outstanding++;
if (h->commands_outstanding > h->max_outstanding)
Expand Down Expand Up @@ -225,10 +222,10 @@ static unsigned long SA5_completed(struct ctlr_info *h)

#ifdef HPSA_DEBUG
if (register_value != FIFO_EMPTY)
printk(KERN_INFO "hpsa: Read %lx back from board\n",
dev_dbg(&h->pdev->dev, "Read %lx back from board\n",
register_value);
else
printk(KERN_INFO "hpsa: FIFO Empty read\n");
dev_dbg(&h->pdev->dev, "hpsa: FIFO Empty read\n");
#endif

return register_value;
Expand All @@ -240,9 +237,7 @@ static unsigned long SA5_intr_pending(struct ctlr_info *h)
{
unsigned long register_value =
readl(h->vaddr + SA5_INTR_STATUS);
#ifdef HPSA_DEBUG
printk(KERN_INFO "hpsa: intr_pending %lx\n", register_value);
#endif /* HPSA_DEBUG */
dev_dbg(&h->pdev->dev, "intr_pending %lx\n", register_value);
if (register_value & SA5_INTR_PENDING)
return 1;
return 0 ;
Expand Down

0 comments on commit 0fb4bf3

Please sign in to comment.