lkml.org 
[lkml]   [2019]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 237/276] scsi: lpfc: avoid uninitialized variable warning
    Date
    [ Upstream commit faf5a744f4f8d76e7c03912b5cd381ac8045f6ec ]

    clang -Wuninitialized incorrectly sees a variable being used without
    initialization:

    drivers/scsi/lpfc/lpfc_nvme.c:2102:37: error: variable 'localport' is uninitialized when used here
    [-Werror,-Wuninitialized]
    lport = (struct lpfc_nvme_lport *)localport->private;
    ^~~~~~~~~
    drivers/scsi/lpfc/lpfc_nvme.c:2059:38: note: initialize the variable 'localport' to silence this warning
    struct nvme_fc_local_port *localport;
    ^
    = NULL
    1 error generated.

    This is clearly in dead code, as the condition leading up to it is always
    false when CONFIG_NVME_FC is disabled, and the variable is always
    initialized when nvme_fc_register_localport() got called successfully.

    Change the preprocessor conditional to the equivalent C construct, which
    makes the code more readable and gets rid of the warning.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Acked-by: James Smart <james.smart@broadcom.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/lpfc/lpfc_nvme.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
    index ca62117a2d131..099f70798fdda 100644
    --- a/drivers/scsi/lpfc/lpfc_nvme.c
    +++ b/drivers/scsi/lpfc/lpfc_nvme.c
    @@ -2482,15 +2482,15 @@ lpfc_nvme_create_localport(struct lpfc_vport *vport)
    if (!cstat)
    return -ENOMEM;

    + if (!IS_ENABLED(CONFIG_NVME_FC))
    + return ret;
    +
    /* localport is allocated from the stack, but the registration
    * call allocates heap memory as well as the private area.
    */
    -#if (IS_ENABLED(CONFIG_NVME_FC))
    +
    ret = nvme_fc_register_localport(&nfcp_info, &lpfc_nvme_template,
    &vport->phba->pcidev->dev, &localport);
    -#else
    - ret = -ENOMEM;
    -#endif
    if (!ret) {
    lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME | LOG_NVME_DISC,
    "6005 Successfully registered local "
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-05-30 05:38    [W:4.088 / U:0.428 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site