diff options
Diffstat (limited to 'drivers/scsi/smartpqi/smartpqi_init.c')
-rw-r--r-- | drivers/scsi/smartpqi/smartpqi_init.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index e2fa3f476227..7bde6c809442 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c | |||
@@ -3576,9 +3576,9 @@ static int pqi_alloc_operational_queues(struct pqi_ctrl_info *ctrl_info) | |||
3576 | alloc_length += PQI_EXTRA_SGL_MEMORY; | 3576 | alloc_length += PQI_EXTRA_SGL_MEMORY; |
3577 | 3577 | ||
3578 | ctrl_info->queue_memory_base = | 3578 | ctrl_info->queue_memory_base = |
3579 | dma_zalloc_coherent(&ctrl_info->pci_dev->dev, | 3579 | dma_alloc_coherent(&ctrl_info->pci_dev->dev, alloc_length, |
3580 | alloc_length, | 3580 | &ctrl_info->queue_memory_base_dma_handle, |
3581 | &ctrl_info->queue_memory_base_dma_handle, GFP_KERNEL); | 3581 | GFP_KERNEL); |
3582 | 3582 | ||
3583 | if (!ctrl_info->queue_memory_base) | 3583 | if (!ctrl_info->queue_memory_base) |
3584 | return -ENOMEM; | 3584 | return -ENOMEM; |
@@ -3715,10 +3715,9 @@ static int pqi_alloc_admin_queues(struct pqi_ctrl_info *ctrl_info) | |||
3715 | PQI_QUEUE_ELEMENT_ARRAY_ALIGNMENT; | 3715 | PQI_QUEUE_ELEMENT_ARRAY_ALIGNMENT; |
3716 | 3716 | ||
3717 | ctrl_info->admin_queue_memory_base = | 3717 | ctrl_info->admin_queue_memory_base = |
3718 | dma_zalloc_coherent(&ctrl_info->pci_dev->dev, | 3718 | dma_alloc_coherent(&ctrl_info->pci_dev->dev, alloc_length, |
3719 | alloc_length, | 3719 | &ctrl_info->admin_queue_memory_base_dma_handle, |
3720 | &ctrl_info->admin_queue_memory_base_dma_handle, | 3720 | GFP_KERNEL); |
3721 | GFP_KERNEL); | ||
3722 | 3721 | ||
3723 | if (!ctrl_info->admin_queue_memory_base) | 3722 | if (!ctrl_info->admin_queue_memory_base) |
3724 | return -ENOMEM; | 3723 | return -ENOMEM; |
@@ -4602,9 +4601,10 @@ static void pqi_free_all_io_requests(struct pqi_ctrl_info *ctrl_info) | |||
4602 | 4601 | ||
4603 | static inline int pqi_alloc_error_buffer(struct pqi_ctrl_info *ctrl_info) | 4602 | static inline int pqi_alloc_error_buffer(struct pqi_ctrl_info *ctrl_info) |
4604 | { | 4603 | { |
4605 | ctrl_info->error_buffer = dma_zalloc_coherent(&ctrl_info->pci_dev->dev, | 4604 | ctrl_info->error_buffer = dma_alloc_coherent(&ctrl_info->pci_dev->dev, |
4606 | ctrl_info->error_buffer_length, | 4605 | ctrl_info->error_buffer_length, |
4607 | &ctrl_info->error_buffer_dma_handle, GFP_KERNEL); | 4606 | &ctrl_info->error_buffer_dma_handle, |
4607 | GFP_KERNEL); | ||
4608 | 4608 | ||
4609 | if (!ctrl_info->error_buffer) | 4609 | if (!ctrl_info->error_buffer) |
4610 | return -ENOMEM; | 4610 | return -ENOMEM; |
@@ -7487,8 +7487,8 @@ static int pqi_ofa_alloc_mem(struct pqi_ctrl_info *ctrl_info, | |||
7487 | dma_addr_t dma_handle; | 7487 | dma_addr_t dma_handle; |
7488 | 7488 | ||
7489 | ctrl_info->pqi_ofa_chunk_virt_addr[i] = | 7489 | ctrl_info->pqi_ofa_chunk_virt_addr[i] = |
7490 | dma_zalloc_coherent(dev, chunk_size, &dma_handle, | 7490 | dma_alloc_coherent(dev, chunk_size, &dma_handle, |
7491 | GFP_KERNEL); | 7491 | GFP_KERNEL); |
7492 | 7492 | ||
7493 | if (!ctrl_info->pqi_ofa_chunk_virt_addr[i]) | 7493 | if (!ctrl_info->pqi_ofa_chunk_virt_addr[i]) |
7494 | break; | 7494 | break; |
@@ -7545,10 +7545,10 @@ static void pqi_ofa_setup_host_buffer(struct pqi_ctrl_info *ctrl_info, | |||
7545 | struct device *dev; | 7545 | struct device *dev; |
7546 | 7546 | ||
7547 | dev = &ctrl_info->pci_dev->dev; | 7547 | dev = &ctrl_info->pci_dev->dev; |
7548 | pqi_ofa_memory = dma_zalloc_coherent(dev, | 7548 | pqi_ofa_memory = dma_alloc_coherent(dev, |
7549 | PQI_OFA_MEMORY_DESCRIPTOR_LENGTH, | 7549 | PQI_OFA_MEMORY_DESCRIPTOR_LENGTH, |
7550 | &ctrl_info->pqi_ofa_mem_dma_handle, | 7550 | &ctrl_info->pqi_ofa_mem_dma_handle, |
7551 | GFP_KERNEL); | 7551 | GFP_KERNEL); |
7552 | 7552 | ||
7553 | if (!pqi_ofa_memory) | 7553 | if (!pqi_ofa_memory) |
7554 | return; | 7554 | return; |