From patchwork Wed Oct 11 15:36:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Himanshu Jha X-Patchwork-Id: 9999937 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4FD7C60216 for ; Wed, 11 Oct 2017 15:37:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4274228A55 for ; Wed, 11 Oct 2017 15:37:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3737F28A86; Wed, 11 Oct 2017 15:37:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_HI, RCVD_IN_SBL_CSS, RCVD_IN_SORBS_SPAM, RCVD_IN_SORBS_WEB autolearn=no version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EAA1528A55 for ; Wed, 11 Oct 2017 15:37:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756900AbdJKPgx (ORCPT ); Wed, 11 Oct 2017 11:36:53 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35955 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752373AbdJKPgj (ORCPT ); Wed, 11 Oct 2017 11:36:39 -0400 Received: by mail-pf0-f196.google.com with SMTP id z11so2639237pfk.3; Wed, 11 Oct 2017 08:36:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=UZvoFuVA4QaQWMzerg1m6IUTI1vqwYMCJf1yH7mZJnU=; b=fSsSGssvvauxl78881mCZQXomfi1DfpfzlbWLAnHjptYnUqT7tRxfRnkLm/Em7tOmJ APf/tvH7dXCa2u9Yw3T/dfVvld7PeHX9cufBBgVhXay4JSnr6uJ4b+QFnEoru9j+BM/U N62qohKmyAJQ7eM+fd+gdSCgGZaJZf7AJS4ofziSV0P1iVy2vRCBfK8IYg3pQc6O2oTq LfRmCWkJ5d0/jBdZeVpbAnxps7p8OEmc648+Pw63S9D78zXsP9cePZHQYVNz9Fd4iJUB RRJ55v8KWIJQBGR7V2gkwjDCZ658jZVdx/Ax4X+Jo0xm8u+7Bg4AefugUAXAB/OzKY3o ergQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=UZvoFuVA4QaQWMzerg1m6IUTI1vqwYMCJf1yH7mZJnU=; b=LRUd+rShmwbp4gljW/WWoJd6ku+HgJ/DzLhlrcHINbzmojEKuDTQ5p/5ozDk1ETKHw +yODPEuF9x6/4W95TCiwY0kgLLwOq+iTMeHVo3MRyQVZoK9Sonm0WUfit0cjYAtYzemM pJr8W4Du8LDS/Q05oHHZaaRMpq8r7pF/38QIzyl+a9A9a00ptEnweQygm41y+xpJIesC R5K3vBE2PMUZqeypq0QtX3F8rtREvgLbjDMEfWWbxMUKiWNB6hARGgEy3E3GwHwGGZEq nw2uzCmG/zzD8ypdnTCjxUbVTWt57FNPctmOzaCFsSm1DloFUodkZ86EBf2IDdkSPTdN ddhw== X-Gm-Message-State: AMCzsaV5FcJW6S1hjMLckgvgtTRCwzcfQYH7BCP0k6Bt7MvmUm6HKzXA mvtzoja2kb9F/yWK+XOKsO9rhA== X-Google-Smtp-Source: AOwi7QDP04IaznVqZAWavXTeeF9cuBpBBn/QyURHUfGN8A7b50zj8wP8vvr7mNq+ekU8RjK7vaxKyQ== X-Received: by 10.101.72.65 with SMTP id i1mr25425pgs.436.1507736198611; Wed, 11 Oct 2017 08:36:38 -0700 (PDT) Received: from localhost.localdomain ([103.254.204.108]) by smtp.gmail.com with ESMTPSA id n2sm20806736pgq.30.2017.10.11.08.36.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Oct 2017 08:36:37 -0700 (PDT) From: Himanshu Jha To: jejb@linux.vnet.ibm.com Cc: martin.petersen@oracle.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, subbu.seetharaman@broadcom.com, ketan.mukadam@broadcom.com, jitendra.bhivare@broadcom.com, Himanshu Jha Subject: [PATCH v2] scsi: be2iscsi: Use kasprintf Date: Wed, 11 Oct 2017 21:06:14 +0530 Message-Id: <1507736174-13089-1-git-send-email-himanshujha199640@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Kyle Fortin Reviewed-by: Jitendra Bhivare --- v2: -remove the unnecessary macro BEISCSI_MSI_NAME. drivers/scsi/be2iscsi/be_main.c | 12 +++++------- drivers/scsi/be2iscsi/be_main.h | 2 -- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index b4542e7..6a9ee0e 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -803,15 +803,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]); @@ -824,13 +823,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) { diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h index 81ce3ff..8166de5 100644 --- a/drivers/scsi/be2iscsi/be_main.h +++ b/drivers/scsi/be2iscsi/be_main.h @@ -155,8 +155,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