The "evt_dat" variale is non-NULL at this point so there is no need to
check.  Delete the check and pull the code in a tab.

Signed-off-by: Dan Carpenter <error27@gmail.com>
---
 drivers/scsi/lpfc/lpfc_bsg.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index c95165905483..7354ae9ba8e5 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -1329,10 +1329,8 @@ lpfc_bsg_hba_get_event(struct bsg_job *job)
 	else
 		bsg_reply->reply_payload_rcv_len = 0;
 
-	if (evt_dat) {
-		kfree(evt_dat->data);
-		kfree(evt_dat);
-	}
+	kfree(evt_dat->data);
+	kfree(evt_dat);
 
 	spin_lock_irqsave(&phba->ct_ev_lock, flags);
 	lpfc_bsg_event_unref(evt);
-- 
2.53.0

On Thu, 13 Aug 2026 10:09:32 +0300, Dan Carpenter wrote:

> The "evt_dat" variale is non-NULL at this point so there is no need to
> check.  Delete the check and pull the code in a tab.

Applied to 7.3/scsi-queue, thanks!

[1/1] scsi: lpfc: remove unnnecessary NULL check
      https://git.kernel.org/mkp/scsi/c/0ec418204f23

-- 
Martin K. Petersen

Dan,

> The "evt_dat" variale is non-NULL at this point so there is no need to
> check. Delete the check and pull the code in a tab.

Applied to 7.3/scsi-staging, thanks!

-- 
Martin K. Petersen

On Thu, Aug 13, 2026 at 3:09 AM Dan Carpenter <error27@gmail.com> wrote:
>
> The "evt_dat" variale is non-NULL at this point so there is no need to
> check.  Delete the check and pull the code in a tab.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
> ---
>  drivers/scsi/lpfc/lpfc_bsg.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
> index c95165905483..7354ae9ba8e5 100644
> --- a/drivers/scsi/lpfc/lpfc_bsg.c
> +++ b/drivers/scsi/lpfc/lpfc_bsg.c
> @@ -1329,10 +1329,8 @@ lpfc_bsg_hba_get_event(struct bsg_job *job)
>         else
>                 bsg_reply->reply_payload_rcv_len = 0;
>
> -       if (evt_dat) {
> -               kfree(evt_dat->data);
> -               kfree(evt_dat);
> -       }
> +       kfree(evt_dat->data);
> +       kfree(evt_dat);
>
>         spin_lock_irqsave(&phba->ct_ev_lock, flags);
>         lpfc_bsg_event_unref(evt);
> --
> 2.53.0
>

Yes, evt_data was already checked for NULL and the follow up check has no value.
Looks good.

Reviewed-by: Paul Ely <paul.ely@broadcom.com>