diff options
Diffstat (limited to 'drivers/scsi/bnx2fc/bnx2fc_tgt.c')
| -rw-r--r-- | drivers/scsi/bnx2fc/bnx2fc_tgt.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/drivers/scsi/bnx2fc/bnx2fc_tgt.c b/drivers/scsi/bnx2fc/bnx2fc_tgt.c index e3d1c7c440c8..d735e87e416a 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_tgt.c +++ b/drivers/scsi/bnx2fc/bnx2fc_tgt.c | |||
| @@ -672,8 +672,8 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba, | |||
| 672 | tgt->sq_mem_size = (tgt->sq_mem_size + (CNIC_PAGE_SIZE - 1)) & | 672 | tgt->sq_mem_size = (tgt->sq_mem_size + (CNIC_PAGE_SIZE - 1)) & |
| 673 | CNIC_PAGE_MASK; | 673 | CNIC_PAGE_MASK; |
| 674 | 674 | ||
| 675 | tgt->sq = dma_zalloc_coherent(&hba->pcidev->dev, tgt->sq_mem_size, | 675 | tgt->sq = dma_alloc_coherent(&hba->pcidev->dev, tgt->sq_mem_size, |
| 676 | &tgt->sq_dma, GFP_KERNEL); | 676 | &tgt->sq_dma, GFP_KERNEL); |
| 677 | if (!tgt->sq) { | 677 | if (!tgt->sq) { |
| 678 | printk(KERN_ERR PFX "unable to allocate SQ memory %d\n", | 678 | printk(KERN_ERR PFX "unable to allocate SQ memory %d\n", |
| 679 | tgt->sq_mem_size); | 679 | tgt->sq_mem_size); |
| @@ -685,8 +685,8 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba, | |||
| 685 | tgt->cq_mem_size = (tgt->cq_mem_size + (CNIC_PAGE_SIZE - 1)) & | 685 | tgt->cq_mem_size = (tgt->cq_mem_size + (CNIC_PAGE_SIZE - 1)) & |
| 686 | CNIC_PAGE_MASK; | 686 | CNIC_PAGE_MASK; |
| 687 | 687 | ||
| 688 | tgt->cq = dma_zalloc_coherent(&hba->pcidev->dev, tgt->cq_mem_size, | 688 | tgt->cq = dma_alloc_coherent(&hba->pcidev->dev, tgt->cq_mem_size, |
| 689 | &tgt->cq_dma, GFP_KERNEL); | 689 | &tgt->cq_dma, GFP_KERNEL); |
| 690 | if (!tgt->cq) { | 690 | if (!tgt->cq) { |
| 691 | printk(KERN_ERR PFX "unable to allocate CQ memory %d\n", | 691 | printk(KERN_ERR PFX "unable to allocate CQ memory %d\n", |
| 692 | tgt->cq_mem_size); | 692 | tgt->cq_mem_size); |
| @@ -698,8 +698,8 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba, | |||
| 698 | tgt->rq_mem_size = (tgt->rq_mem_size + (CNIC_PAGE_SIZE - 1)) & | 698 | tgt->rq_mem_size = (tgt->rq_mem_size + (CNIC_PAGE_SIZE - 1)) & |
| 699 | CNIC_PAGE_MASK; | 699 | CNIC_PAGE_MASK; |
| 700 | 700 | ||
| 701 | tgt->rq = dma_zalloc_coherent(&hba->pcidev->dev, tgt->rq_mem_size, | 701 | tgt->rq = dma_alloc_coherent(&hba->pcidev->dev, tgt->rq_mem_size, |
| 702 | &tgt->rq_dma, GFP_KERNEL); | 702 | &tgt->rq_dma, GFP_KERNEL); |
| 703 | if (!tgt->rq) { | 703 | if (!tgt->rq) { |
| 704 | printk(KERN_ERR PFX "unable to allocate RQ memory %d\n", | 704 | printk(KERN_ERR PFX "unable to allocate RQ memory %d\n", |
| 705 | tgt->rq_mem_size); | 705 | tgt->rq_mem_size); |
| @@ -710,8 +710,8 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba, | |||
| 710 | tgt->rq_pbl_size = (tgt->rq_pbl_size + (CNIC_PAGE_SIZE - 1)) & | 710 | tgt->rq_pbl_size = (tgt->rq_pbl_size + (CNIC_PAGE_SIZE - 1)) & |
| 711 | CNIC_PAGE_MASK; | 711 | CNIC_PAGE_MASK; |
| 712 | 712 | ||
| 713 | tgt->rq_pbl = dma_zalloc_coherent(&hba->pcidev->dev, tgt->rq_pbl_size, | 713 | tgt->rq_pbl = dma_alloc_coherent(&hba->pcidev->dev, tgt->rq_pbl_size, |
| 714 | &tgt->rq_pbl_dma, GFP_KERNEL); | 714 | &tgt->rq_pbl_dma, GFP_KERNEL); |
| 715 | if (!tgt->rq_pbl) { | 715 | if (!tgt->rq_pbl) { |
| 716 | printk(KERN_ERR PFX "unable to allocate RQ PBL %d\n", | 716 | printk(KERN_ERR PFX "unable to allocate RQ PBL %d\n", |
| 717 | tgt->rq_pbl_size); | 717 | tgt->rq_pbl_size); |
| @@ -735,9 +735,9 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba, | |||
| 735 | tgt->xferq_mem_size = (tgt->xferq_mem_size + (CNIC_PAGE_SIZE - 1)) & | 735 | tgt->xferq_mem_size = (tgt->xferq_mem_size + (CNIC_PAGE_SIZE - 1)) & |
| 736 | CNIC_PAGE_MASK; | 736 | CNIC_PAGE_MASK; |
| 737 | 737 | ||
| 738 | tgt->xferq = dma_zalloc_coherent(&hba->pcidev->dev, | 738 | tgt->xferq = dma_alloc_coherent(&hba->pcidev->dev, |
| 739 | tgt->xferq_mem_size, &tgt->xferq_dma, | 739 | tgt->xferq_mem_size, &tgt->xferq_dma, |
| 740 | GFP_KERNEL); | 740 | GFP_KERNEL); |
| 741 | if (!tgt->xferq) { | 741 | if (!tgt->xferq) { |
| 742 | printk(KERN_ERR PFX "unable to allocate XFERQ %d\n", | 742 | printk(KERN_ERR PFX "unable to allocate XFERQ %d\n", |
| 743 | tgt->xferq_mem_size); | 743 | tgt->xferq_mem_size); |
| @@ -749,9 +749,9 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba, | |||
| 749 | tgt->confq_mem_size = (tgt->confq_mem_size + (CNIC_PAGE_SIZE - 1)) & | 749 | tgt->confq_mem_size = (tgt->confq_mem_size + (CNIC_PAGE_SIZE - 1)) & |
| 750 | CNIC_PAGE_MASK; | 750 | CNIC_PAGE_MASK; |
| 751 | 751 | ||
| 752 | tgt->confq = dma_zalloc_coherent(&hba->pcidev->dev, | 752 | tgt->confq = dma_alloc_coherent(&hba->pcidev->dev, |
| 753 | tgt->confq_mem_size, &tgt->confq_dma, | 753 | tgt->confq_mem_size, &tgt->confq_dma, |
| 754 | GFP_KERNEL); | 754 | GFP_KERNEL); |
| 755 | if (!tgt->confq) { | 755 | if (!tgt->confq) { |
| 756 | printk(KERN_ERR PFX "unable to allocate CONFQ %d\n", | 756 | printk(KERN_ERR PFX "unable to allocate CONFQ %d\n", |
| 757 | tgt->confq_mem_size); | 757 | tgt->confq_mem_size); |
| @@ -763,9 +763,9 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba, | |||
| 763 | tgt->confq_pbl_size = | 763 | tgt->confq_pbl_size = |
| 764 | (tgt->confq_pbl_size + (CNIC_PAGE_SIZE - 1)) & CNIC_PAGE_MASK; | 764 | (tgt->confq_pbl_size + (CNIC_PAGE_SIZE - 1)) & CNIC_PAGE_MASK; |
| 765 | 765 | ||
| 766 | tgt->confq_pbl = dma_zalloc_coherent(&hba->pcidev->dev, | 766 | tgt->confq_pbl = dma_alloc_coherent(&hba->pcidev->dev, |
| 767 | tgt->confq_pbl_size, | 767 | tgt->confq_pbl_size, |
| 768 | &tgt->confq_pbl_dma, GFP_KERNEL); | 768 | &tgt->confq_pbl_dma, GFP_KERNEL); |
| 769 | if (!tgt->confq_pbl) { | 769 | if (!tgt->confq_pbl) { |
| 770 | printk(KERN_ERR PFX "unable to allocate CONFQ PBL %d\n", | 770 | printk(KERN_ERR PFX "unable to allocate CONFQ PBL %d\n", |
| 771 | tgt->confq_pbl_size); | 771 | tgt->confq_pbl_size); |
| @@ -787,9 +787,9 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba, | |||
| 787 | /* Allocate and map ConnDB */ | 787 | /* Allocate and map ConnDB */ |
| 788 | tgt->conn_db_mem_size = sizeof(struct fcoe_conn_db); | 788 | tgt->conn_db_mem_size = sizeof(struct fcoe_conn_db); |
| 789 | 789 | ||
| 790 | tgt->conn_db = dma_zalloc_coherent(&hba->pcidev->dev, | 790 | tgt->conn_db = dma_alloc_coherent(&hba->pcidev->dev, |
| 791 | tgt->conn_db_mem_size, | 791 | tgt->conn_db_mem_size, |
| 792 | &tgt->conn_db_dma, GFP_KERNEL); | 792 | &tgt->conn_db_dma, GFP_KERNEL); |
| 793 | if (!tgt->conn_db) { | 793 | if (!tgt->conn_db) { |
| 794 | printk(KERN_ERR PFX "unable to allocate conn_db %d\n", | 794 | printk(KERN_ERR PFX "unable to allocate conn_db %d\n", |
| 795 | tgt->conn_db_mem_size); | 795 | tgt->conn_db_mem_size); |
| @@ -802,8 +802,8 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba, | |||
| 802 | tgt->lcq_mem_size = (tgt->lcq_mem_size + (CNIC_PAGE_SIZE - 1)) & | 802 | tgt->lcq_mem_size = (tgt->lcq_mem_size + (CNIC_PAGE_SIZE - 1)) & |
| 803 | CNIC_PAGE_MASK; | 803 | CNIC_PAGE_MASK; |
| 804 | 804 | ||
| 805 | tgt->lcq = dma_zalloc_coherent(&hba->pcidev->dev, tgt->lcq_mem_size, | 805 | tgt->lcq = dma_alloc_coherent(&hba->pcidev->dev, tgt->lcq_mem_size, |
| 806 | &tgt->lcq_dma, GFP_KERNEL); | 806 | &tgt->lcq_dma, GFP_KERNEL); |
| 807 | 807 | ||
| 808 | if (!tgt->lcq) { | 808 | if (!tgt->lcq) { |
| 809 | printk(KERN_ERR PFX "unable to allocate lcq %d\n", | 809 | printk(KERN_ERR PFX "unable to allocate lcq %d\n", |
