Skip to contentSkip to conversation

drm/msm/hdmi: remove unnecessary NULL check

PATCH In review Dan Carpenter 2 participants 2 messages Nov 18, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drm/msm/hdmi: remove unnecessary NULL check

This code was recently refactored in commit and now the "hdmi" pointer can't be NULL. Checking for NULL leads to a Smatch warning:

drivers/gpu/drm/msm/hdmi/hdmi.c:141 msm_hdmi_init()
warn: variable dereferenced before check 'hdmi' (see line 119)

Fixes 69a88d8633ec ("drm/msm/hdmi: move resource allocation to probe function")

---
v2: Add a Fixes tag. Re-work the commit message.

 drivers/gpu/drm/msm/hdmi/hdmi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/msm/hdmi/hdmi.c +1 -2
index 7001fabd0977..4d3fdc806bef 100644
@@ -138,8 +138,7 @@ static int msm_hdmi_init(struct hdmi *hdmi)
 	return 0;
 
 fail:
-	if (hdmi)
-		msm_hdmi_destroy(hdmi);
+	msm_hdmi_destroy(hdmi);
 
 	return ret;
 }
Signature · 1 line
2.35.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 8 lines · Dan Carpenter

This code was recently refactored in commit and now the "hdmi" pointer can't be NULL. Checking for NULL leads to a Smatch warning:

drivers/gpu/drm/msm/hdmi/hdmi.c:141 msm_hdmi_init()
warn: variable dereferenced before check 'hdmi' (see line 119)

Fixes 69a88d8633ec ("drm/msm/hdmi: move resource allocation to probe function")
Quoted 20 lines

---
v2: Add a Fixes tag. Re-work the commit message.

  drivers/gpu/drm/msm/hdmi/hdmi.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/msm/hdmi/hdmi.c +1 -2
index 7001fabd0977..4d3fdc806bef 100644
@@ -138,8 +138,7 @@ static int msm_hdmi_init(struct hdmi *hdmi)
  	return 0;
 
  fail:
-	if (hdmi)
-		msm_hdmi_destroy(hdmi);
+	msm_hdmi_destroy(hdmi);
 
  	return ret;
  }