mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
scsi: be2iscsi: Use kasprintf
Use kasprintf instead of combination of kmalloc and sprintf. Also, remove BEISCSI_MSI_NAME macro used to specify size of string as kasprintf handles size computations. Signed-off-by: Himanshu Jha <[email protected]> Reviewed-by: Kyle Fortin <[email protected]> Reviewed-by: Jitendra Bhivare <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
This commit is contained in:
parent
c58cc70fde
commit
d38c9a803b
2 changed files with 5 additions and 9 deletions
|
|
@ -818,15 +818,14 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba)
|
|||
|
||||
if (pcidev->msix_enabled) {
|
||||
for (i = 0; i < phba->num_cpus; i++) {
|
||||
phba->msi_name[i] = kzalloc(BEISCSI_MSI_NAME,
|
||||
GFP_KERNEL);
|
||||
phba->msi_name[i] = kasprintf(GFP_KERNEL,
|
||||
"beiscsi_%02x_%02x",
|
||||
phba->shost->host_no, i);
|
||||
if (!phba->msi_name[i]) {
|
||||
ret = -ENOMEM;
|
||||
goto free_msix_irqs;
|
||||
}
|
||||
|
||||
sprintf(phba->msi_name[i], "beiscsi_%02x_%02x",
|
||||
phba->shost->host_no, i);
|
||||
ret = request_irq(pci_irq_vector(pcidev, i),
|
||||
be_isr_msix, 0, phba->msi_name[i],
|
||||
&phwi_context->be_eq[i]);
|
||||
|
|
@ -839,13 +838,12 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba)
|
|||
goto free_msix_irqs;
|
||||
}
|
||||
}
|
||||
phba->msi_name[i] = kzalloc(BEISCSI_MSI_NAME, GFP_KERNEL);
|
||||
phba->msi_name[i] = kasprintf(GFP_KERNEL, "beiscsi_mcc_%02x",
|
||||
phba->shost->host_no);
|
||||
if (!phba->msi_name[i]) {
|
||||
ret = -ENOMEM;
|
||||
goto free_msix_irqs;
|
||||
}
|
||||
sprintf(phba->msi_name[i], "beiscsi_mcc_%02x",
|
||||
phba->shost->host_no);
|
||||
ret = request_irq(pci_irq_vector(pcidev, i), be_isr_mcc, 0,
|
||||
phba->msi_name[i], &phwi_context->be_eq[i]);
|
||||
if (ret) {
|
||||
|
|
|
|||
|
|
@ -153,8 +153,6 @@
|
|||
#define PAGES_REQUIRED(x) \
|
||||
((x < PAGE_SIZE) ? 1 : ((x + PAGE_SIZE - 1) / PAGE_SIZE))
|
||||
|
||||
#define BEISCSI_MSI_NAME 20 /* size of msi_name string */
|
||||
|
||||
#define MEM_DESCR_OFFSET 8
|
||||
#define BEISCSI_DEFQ_HDR 1
|
||||
#define BEISCSI_DEFQ_DATA 0
|
||||
|
|
|
|||
Loading…
Reference in a new issue