aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc/lpfc_sli.c
diff options
context:
space:
mode:
authorJames Smart <James.Smart@Emulex.Com>2006-07-06 15:50:50 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-07-09 11:49:14 -0400
commit65a29c166fe331574880a375559405ac802b027a (patch)
treec1dc8856dd84347d900aa4b11bdffde685529f04 /drivers/scsi/lpfc/lpfc_sli.c
parentb4c026520ff0a4cb838a941bb0ed8996075e3d8c (diff)
[SCSI] lpfc 8.1.7: Misc Fixes
Misc Fixes: - Fix some sparse warnings - casts of address space - Fix handling of the adapter registration string. Each invocation was byteswapping, so every other adapter init attempt failed. - Correct comments and default value for the lpfc_max_luns parameter Signed-off-by: James Smart <James.Smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_sli.c')
-rw-r--r--drivers/scsi/lpfc/lpfc_sli.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index c441e37eb05..350a625fa22 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -1547,8 +1547,8 @@ lpfc_sli_brdready(struct lpfc_hba * phba, uint32_t mask)
1547 1547
1548void lpfc_reset_barrier(struct lpfc_hba * phba) 1548void lpfc_reset_barrier(struct lpfc_hba * phba)
1549{ 1549{
1550 uint32_t * resp_buf; 1550 uint32_t __iomem *resp_buf;
1551 uint32_t * mbox_buf; 1551 uint32_t __iomem *mbox_buf;
1552 volatile uint32_t mbox; 1552 volatile uint32_t mbox;
1553 uint32_t hc_copy; 1553 uint32_t hc_copy;
1554 int i; 1554 int i;
@@ -1564,7 +1564,7 @@ void lpfc_reset_barrier(struct lpfc_hba * phba)
1564 * Tell the other part of the chip to suspend temporarily all 1564 * Tell the other part of the chip to suspend temporarily all
1565 * its DMA activity. 1565 * its DMA activity.
1566 */ 1566 */
1567 resp_buf = (uint32_t *)phba->MBslimaddr; 1567 resp_buf = phba->MBslimaddr;
1568 1568
1569 /* Disable the error attention */ 1569 /* Disable the error attention */
1570 hc_copy = readl(phba->HCregaddr); 1570 hc_copy = readl(phba->HCregaddr);
@@ -1582,7 +1582,7 @@ void lpfc_reset_barrier(struct lpfc_hba * phba)
1582 ((MAILBOX_t *)&mbox)->mbxOwner = OWN_CHIP; 1582 ((MAILBOX_t *)&mbox)->mbxOwner = OWN_CHIP;
1583 1583
1584 writel(BARRIER_TEST_PATTERN, (resp_buf + 1)); 1584 writel(BARRIER_TEST_PATTERN, (resp_buf + 1));
1585 mbox_buf = (uint32_t *)phba->MBslimaddr; 1585 mbox_buf = phba->MBslimaddr;
1586 writel(mbox, mbox_buf); 1586 writel(mbox, mbox_buf);
1587 1587
1588 for (i = 0; 1588 for (i = 0;
@@ -1782,7 +1782,7 @@ lpfc_sli_brdrestart(struct lpfc_hba * phba)
1782 skip_post = 0; 1782 skip_post = 0;
1783 word0 = 0; /* This is really setting up word1 */ 1783 word0 = 0; /* This is really setting up word1 */
1784 } 1784 }
1785 to_slim = (uint8_t *) phba->MBslimaddr + sizeof (uint32_t); 1785 to_slim = phba->MBslimaddr + sizeof (uint32_t);
1786 writel(*(uint32_t *) mb, to_slim); 1786 writel(*(uint32_t *) mb, to_slim);
1787 readl(to_slim); /* flush */ 1787 readl(to_slim); /* flush */
1788 1788