diff options
Diffstat (limited to 'drivers/scsi/qla4xxx/ql4_mbx.c')
| -rw-r--r-- | drivers/scsi/qla4xxx/ql4_mbx.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c index 5d56904687b9..dac9a7013208 100644 --- a/drivers/scsi/qla4xxx/ql4_mbx.c +++ b/drivers/scsi/qla4xxx/ql4_mbx.c | |||
| @@ -625,9 +625,9 @@ int qla4xxx_initialize_fw_cb(struct scsi_qla_host * ha) | |||
| 625 | uint32_t mbox_sts[MBOX_REG_COUNT]; | 625 | uint32_t mbox_sts[MBOX_REG_COUNT]; |
| 626 | int status = QLA_ERROR; | 626 | int status = QLA_ERROR; |
| 627 | 627 | ||
| 628 | init_fw_cb = dma_zalloc_coherent(&ha->pdev->dev, | 628 | init_fw_cb = dma_alloc_coherent(&ha->pdev->dev, |
| 629 | sizeof(struct addr_ctrl_blk), | 629 | sizeof(struct addr_ctrl_blk), |
| 630 | &init_fw_cb_dma, GFP_KERNEL); | 630 | &init_fw_cb_dma, GFP_KERNEL); |
| 631 | if (init_fw_cb == NULL) { | 631 | if (init_fw_cb == NULL) { |
| 632 | DEBUG2(printk("scsi%ld: %s: Unable to alloc init_cb\n", | 632 | DEBUG2(printk("scsi%ld: %s: Unable to alloc init_cb\n", |
| 633 | ha->host_no, __func__)); | 633 | ha->host_no, __func__)); |
| @@ -709,9 +709,9 @@ int qla4xxx_get_dhcp_ip_address(struct scsi_qla_host * ha) | |||
| 709 | uint32_t mbox_cmd[MBOX_REG_COUNT]; | 709 | uint32_t mbox_cmd[MBOX_REG_COUNT]; |
| 710 | uint32_t mbox_sts[MBOX_REG_COUNT]; | 710 | uint32_t mbox_sts[MBOX_REG_COUNT]; |
| 711 | 711 | ||
| 712 | init_fw_cb = dma_zalloc_coherent(&ha->pdev->dev, | 712 | init_fw_cb = dma_alloc_coherent(&ha->pdev->dev, |
| 713 | sizeof(struct addr_ctrl_blk), | 713 | sizeof(struct addr_ctrl_blk), |
| 714 | &init_fw_cb_dma, GFP_KERNEL); | 714 | &init_fw_cb_dma, GFP_KERNEL); |
| 715 | if (init_fw_cb == NULL) { | 715 | if (init_fw_cb == NULL) { |
| 716 | printk("scsi%ld: %s: Unable to alloc init_cb\n", ha->host_no, | 716 | printk("scsi%ld: %s: Unable to alloc init_cb\n", ha->host_no, |
| 717 | __func__); | 717 | __func__); |
| @@ -1340,9 +1340,9 @@ int qla4xxx_about_firmware(struct scsi_qla_host *ha) | |||
| 1340 | uint32_t mbox_sts[MBOX_REG_COUNT]; | 1340 | uint32_t mbox_sts[MBOX_REG_COUNT]; |
| 1341 | int status = QLA_ERROR; | 1341 | int status = QLA_ERROR; |
| 1342 | 1342 | ||
| 1343 | about_fw = dma_zalloc_coherent(&ha->pdev->dev, | 1343 | about_fw = dma_alloc_coherent(&ha->pdev->dev, |
| 1344 | sizeof(struct about_fw_info), | 1344 | sizeof(struct about_fw_info), |
| 1345 | &about_fw_dma, GFP_KERNEL); | 1345 | &about_fw_dma, GFP_KERNEL); |
| 1346 | if (!about_fw) { | 1346 | if (!about_fw) { |
| 1347 | DEBUG2(ql4_printk(KERN_ERR, ha, "%s: Unable to alloc memory " | 1347 | DEBUG2(ql4_printk(KERN_ERR, ha, "%s: Unable to alloc memory " |
| 1348 | "for about_fw\n", __func__)); | 1348 | "for about_fw\n", __func__)); |
