[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <5ae5dd90-6306-52a4-7601-3fb9dbe2f23a@users.sourceforge.net>
Date: Wed, 7 Feb 2018 22:46:41 +0100
From: SF Markus Elfring <elfring@...rs.sourceforge.net>
To: dri-devel@...ts.freedesktop.org, freedreno@...ts.freedesktop.org,
linux-arm-msm@...r.kernel.org,
Daniel Vetter <daniel.vetter@...ll.ch>,
David Airlie <airlied@...ux.ie>,
Jordan Crouse <jcrouse@...eaurora.org>,
Jyri Sarha <jsarha@...com>,
Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
Sushmita Susheelendra <ssusheel@...eaurora.org>,
Rob Clark <robdclark@...il.com>, Rob Herring <robh@...nel.org>
Cc: LKML <linux-kernel@...r.kernel.org>,
kernel-janitors@...r.kernel.org
Subject: [PATCH 2/2] drm/msm/mdp4: Return directly after a failed kzalloc() in
mdp4_kms_init()
From: Markus Elfring <elfring@...rs.sourceforge.net>
Date: Wed, 7 Feb 2018 22:34:45 +0100
* Return directly after a call of the function "kzalloc" failed
at the beginning.
* Delete an initialisation and a check (for the local variable "kms")
which became unnecessary with this refactoring.
Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>
---
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 11 ++++-------
1 file 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 5c5965a9d1f9..4f15cd569ee1 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
@@ -411,15 +411,13 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev)
struct platform_device *pdev = to_platform_device(dev->dev);
struct mdp4_platform_config *config = mdp4_get_config(pdev);
struct mdp4_kms *mdp4_kms;
- struct msm_kms *kms = NULL;
+ struct msm_kms *kms;
struct msm_gem_address_space *aspace;
int irq, ret;
mdp4_kms = kzalloc(sizeof(*mdp4_kms), GFP_KERNEL);
- if (!mdp4_kms) {
- ret = -ENOMEM;
- goto fail;
- }
+ if (!mdp4_kms)
+ return ERR_PTR(-ENOMEM);
mdp_kms_init(&mdp4_kms->base, &kms_funcs);
@@ -550,8 +548,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev)
return kms;
fail:
- if (kms)
- mdp4_destroy(kms);
+ mdp4_destroy(kms);
return ERR_PTR(ret);
}
--
2.16.1
Powered by blists - more mailing lists