From patchwork Tue Dec 17 14:50:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Pietrasiewicz X-Patchwork-Id: 11297831 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8632F138C for ; Tue, 17 Dec 2019 14:53:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6E5FF24655 for ; Tue, 17 Dec 2019 14:53:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E5FF24655 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B6856EA10; Tue, 17 Dec 2019 14:52:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id B64896EA05 for ; Tue, 17 Dec 2019 14:52:36 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: andrzej.p) with ESMTPSA id 98D892927C9 From: Andrzej Pietrasiewicz To: dri-devel@lists.freedesktop.org Subject: [PATCHv5 16/34] drm/komeda: Simplify error handling Date: Tue, 17 Dec 2019 15:50:02 +0100 Message-Id: <20191217145020.14645-17-andrzej.p@collabora.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191217145020.14645-1-andrzej.p@collabora.com> References: <20191213173350.GJ624164@phenom.ffwll.local> <20191217145020.14645-1-andrzej.p@collabora.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ayan Halder , kernel@collabora.com, David Airlie , Liviu Dudau , Sandy Huang , Andrzej Pietrasiewicz , James Wang , Mihail Atanassov , Sean Paul MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Use less code to handle errors. Signed-off-by: Andrzej Pietrasiewicz --- .../arm/display/komeda/komeda_framebuffer.c | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c index aa703aabbeee..f50f83c68c70 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c @@ -145,8 +145,8 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, if (!kfb->format_caps) { DRM_DEBUG_KMS("FMT %x is not supported.\n", mode_cmd->pixel_format); - kfree(kfb); - return ERR_PTR(-EINVAL); + ret = -EINVAL; + goto err_free; } drm_helper_mode_fill_fb_struct(dev, &kfb->base, mode_cmd); @@ -157,15 +157,13 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, if (info->num_planes != 1) { DRM_DEBUG_KMS("AFBC requires exactly 1 plane.\n"); - kfree(kfb); - return ERR_PTR(-EINVAL); + ret = -EINVAL; + goto err_free; } ret = drm_gem_fb_lookup(dev, file, mode_cmd, objs); - if (ret < 0) { - kfree(kfb); - return ERR_PTR(ret); - } + if (ret < 0) + goto err_free; ret = komeda_fb_afbc_size_check(kfb, info, objs, file, mode_cmd); @@ -174,16 +172,14 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, } else { struct drm_gem_object *objs[4]; - if (komeda_fb_check_src_coords(kfb, 0, 0, kfb->base.width, - kfb->base.height)) { - kfree(kfb); - return ERR_PTR(-EINVAL); - } + ret = komeda_fb_check_src_coords(kfb, 0, 0, kfb->base.width, + kfb->base.height); + if (ret) + goto err_free; + ret = drm_gem_fb_lookup(dev, file, mode_cmd, objs); - if (ret < 0) { - kfree(kfb); - return ERR_PTR(ret); - } + if (ret < 0) + goto err_free; ret = komeda_fb_none_afbc_size_check(mdev, info, objs, file, mode_cmd); @@ -214,7 +210,7 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, err_cleanup: for (i = 0; i < kfb->base.format->num_planes; i++) drm_gem_object_put_unlocked(kfb->base.obj[i]); - +err_free: kfree(kfb); return ERR_PTR(ret); }