* [PATCH 1/3] drm/msm/hdmi: Delete an unnecessary check before the function call "kfree"
2016-07-13 17:54 ` [PATCH 0/3] drm/msm: Deletion of a few unnecessary checks SF Markus Elfring
@ 2016-07-13 18:00 ` SF Markus Elfring
2016-07-13 18:01 ` [PATCH 2/3] drm/msm: Delete unnecessary checks before drm_gem_object_unreference_unlocked() SF Markus Elfring
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: SF Markus Elfring @ 2016-07-13 18:00 UTC (permalink / raw)
To: David Airlie, Rob Clark, dri-devel, freedreno, linux-arm-msm
Cc: Julia Lawall, kernel-janitors, LKML
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 13 Jul 2016 18:54:11 +0200
The kfree() function tests whether its argument is NULL and then
returns immediately. Thus the test around the call is not needed.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c b/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c
index 0baaaaa..6e76797 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c
@@ -1430,7 +1430,7 @@ struct hdmi_hdcp_ctrl *msm_hdmi_hdcp_init(struct hdmi *hdmi)
void msm_hdmi_hdcp_destroy(struct hdmi *hdmi)
{
- if (hdmi && hdmi->hdcp_ctrl) {
+ if (hdmi) {
kfree(hdmi->hdcp_ctrl);
hdmi->hdcp_ctrl = NULL;
}
--
2.9.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] drm/msm: Delete unnecessary checks before drm_gem_object_unreference_unlocked()
2016-07-13 17:54 ` [PATCH 0/3] drm/msm: Deletion of a few unnecessary checks SF Markus Elfring
2016-07-13 18:00 ` [PATCH 1/3] drm/msm/hdmi: Delete an unnecessary check before the function call "kfree" SF Markus Elfring
@ 2016-07-13 18:01 ` SF Markus Elfring
2016-07-13 18:02 ` [PATCH 3/3] drm/msm: Delete an unnecessary check before drm_gem_object_unreference() SF Markus Elfring
2016-07-15 2:08 ` [PATCH 0/3] drm/msm: Deletion of a few unnecessary checks Rob Clark
3 siblings, 0 replies; 5+ messages in thread
From: SF Markus Elfring @ 2016-07-13 18:01 UTC (permalink / raw)
To: David Airlie, Rob Clark, dri-devel, freedreno, linux-arm-msm
Cc: Julia Lawall, kernel-janitors, LKML
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 13 Jul 2016 19:15:35 +0200
The drm_gem_object_unreference_unlocked() function tests whether
its argument is NULL and then returns immediately.
Thus the test around the calls is not needed.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 3 +--
drivers/gpu/drm/msm/msm_fb.c | 4 ++--
drivers/gpu/drm/msm/msm_gem.c | 4 +---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
index ba8df15..7b39e89 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
@@ -168,8 +168,7 @@ static void mdp4_destroy(struct msm_kms *kms)
if (mdp4_kms->blank_cursor_iova)
msm_gem_put_iova(mdp4_kms->blank_cursor_bo, mdp4_kms->id);
- if (mdp4_kms->blank_cursor_bo)
- drm_gem_object_unreference_unlocked(mdp4_kms->blank_cursor_bo);
+ drm_gem_object_unreference_unlocked(mdp4_kms->blank_cursor_bo);
if (mdp4_kms->rpm_enabled)
pm_runtime_disable(dev);
diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
index 7919c24..95cf8fe 100644
--- a/drivers/gpu/drm/msm/msm_fb.c
+++ b/drivers/gpu/drm/msm/msm_fb.c
@@ -49,8 +49,8 @@ static void msm_framebuffer_destroy(struct drm_framebuffer *fb)
for (i = 0; i < n; i++) {
struct drm_gem_object *bo = msm_fb->planes[i];
- if (bo)
- drm_gem_object_unreference_unlocked(bo);
+
+ drm_gem_object_unreference_unlocked(bo);
}
kfree(msm_fb);
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 886cfe0..9a713fb 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -875,8 +875,6 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev,
return obj;
fail:
- if (obj)
- drm_gem_object_unreference_unlocked(obj);
-
+ drm_gem_object_unreference_unlocked(obj);
return ERR_PTR(ret);
}
--
2.9.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] drm/msm: Delete an unnecessary check before drm_gem_object_unreference()
2016-07-13 17:54 ` [PATCH 0/3] drm/msm: Deletion of a few unnecessary checks SF Markus Elfring
2016-07-13 18:00 ` [PATCH 1/3] drm/msm/hdmi: Delete an unnecessary check before the function call "kfree" SF Markus Elfring
2016-07-13 18:01 ` [PATCH 2/3] drm/msm: Delete unnecessary checks before drm_gem_object_unreference_unlocked() SF Markus Elfring
@ 2016-07-13 18:02 ` SF Markus Elfring
2016-07-15 2:08 ` [PATCH 0/3] drm/msm: Deletion of a few unnecessary checks Rob Clark
3 siblings, 0 replies; 5+ messages in thread
From: SF Markus Elfring @ 2016-07-13 18:02 UTC (permalink / raw)
To: David Airlie, Rob Clark, dri-devel, freedreno, linux-arm-msm
Cc: Julia Lawall, kernel-janitors, LKML
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 13 Jul 2016 19:29:19 +0200
The drm_gem_object_unreference() function tests whether its argument
is NULL and then returns immediately.
Thus the test around the call is not needed.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/gpu/drm/msm/msm_gem.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 9a713fb..6cd4af4 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -830,9 +830,7 @@ struct drm_gem_object *msm_gem_new(struct drm_device *dev,
return obj;
fail:
- if (obj)
- drm_gem_object_unreference(obj);
-
+ drm_gem_object_unreference(obj);
return ERR_PTR(ret);
}
--
2.9.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] drm/msm: Deletion of a few unnecessary checks
2016-07-13 17:54 ` [PATCH 0/3] drm/msm: Deletion of a few unnecessary checks SF Markus Elfring
` (2 preceding siblings ...)
2016-07-13 18:02 ` [PATCH 3/3] drm/msm: Delete an unnecessary check before drm_gem_object_unreference() SF Markus Elfring
@ 2016-07-15 2:08 ` Rob Clark
3 siblings, 0 replies; 5+ messages in thread
From: Rob Clark @ 2016-07-15 2:08 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-arm-msm, kernel-janitors, LKML,
dri-devel@lists.freedesktop.org, Julia Lawall, freedreno
On Wed, Jul 13, 2016 at 1:54 PM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 13 Jul 2016 19:46:45 +0200
>
> A few update suggestions were taken into account
> from static source code analysis.
>
> Markus Elfring (3):
> HDMI: Delete an unnecessary check before the function call "kfree"
> Delete unnecessary checks before drm_gem_object_unreference_unlocked()
> Delete an unnecessary check before drm_gem_object_unreference()
thanks, I've pushed these to msm-next
BR,
-R
> drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 2 +-
> drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 3 +--
> drivers/gpu/drm/msm/msm_fb.c | 4 ++--
> drivers/gpu/drm/msm/msm_gem.c | 8 ++------
> 4 files changed, 6 insertions(+), 11 deletions(-)
>
> --
> 2.9.0
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread