From patchwork Mon Mar 2 22:26:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11416659 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 230DF14B4 for ; Mon, 2 Mar 2020 22:28:29 +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 018F220866 for ; Mon, 2 Mar 2020 22:28:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="XZuNIpd0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 018F220866 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 6F8CB6E8D6; Mon, 2 Mar 2020 22:27:33 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id BBCA36E8D9 for ; Mon, 2 Mar 2020 22:27:31 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id z11so1829674wro.9 for ; Mon, 02 Mar 2020 14:27:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YaqoQK4JapBefAfXiK3AF28YNurDMAX13lAGeSaxSd8=; b=XZuNIpd0RLsK2Ohw6sreK64S69PyAKcaxTvu7Ge5eH6DP0jAOJHHlK4pnW8cqaaVY/ pTkKb8BElNQ1YB6h6+jzByHXsFaF9M3zU++xt3nGG0ALN+7rELx+TdEJgKhC+QrRebL7 BFiCDK76ofWSW69diu/4lQh+zHMb9sBNLryN4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YaqoQK4JapBefAfXiK3AF28YNurDMAX13lAGeSaxSd8=; b=F1TlEgsddVwgRNe7fQDgfOfy+a17FEGk/Q0E6NeijuqOu8wTWn9b6b4S7guL3eVibI QckCP/sqQpzO33uma5r9ylOj/P+EWUChx5k0xN2WHzQltBg+AY3r7yrDPfKTYvsfvazQ sNRKv66gGi/+9itF2zeybq5JVY00Wn/sJt+eE7sOXoeH5fI8/PgLJ3Ur2UJai7GfqWVb t9EUr7njAvTRtlEHcUA0y2RStwLCPX9+w20NjwJ9t7hkfW0LsA54jsOzHyNSnV7fl4Xa UTqO9teMzROpWJNhRAIL9mTdkiFlmcjG4+5Mj+6co3Oj7lrOlMlF+dPFV9jsCmzJWOG7 GlYg== X-Gm-Message-State: ANhLgQ2AdBdhFW3wugJaYzLpWfx5cXcEXwFH2A5oGgYHfixx7cbawzaL 2DXj2BEh08OfjCsVvCAMB0ZfY1IGAkE= X-Google-Smtp-Source: ADFU+vvgDWbZ+V+yI4H3g3usPcXvvr47gHCVFOJJ1bBsaWDMjg4jFPYWKCpAiOUhBlSzWgENlN1mZw== X-Received: by 2002:adf:f751:: with SMTP id z17mr1671078wrp.207.1583188050185; Mon, 02 Mar 2020 14:27:30 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id o18sm26114589wrv.60.2020.03.02.14.27.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 14:27:29 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 40/51] drm/mtk: Drop explicit drm_mode_config_cleanup call Date: Mon, 2 Mar 2020 23:26:20 +0100 Message-Id: <20200302222631.3861340-41-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200302222631.3861340-1-daniel.vetter@ffwll.ch> References: <20200302222631.3861340-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 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: Daniel Vetter , Intel Graphics Development , Laurent Pinchart , Thomas Zimmermann , Daniel Vetter , Sam Ravnborg Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" It's right above the drm_dev_put(). This is made possible by a preceeding patch which added a drmm_ cleanup action to drm_mode_config_init(), hence all we need to do to ensure that drm_mode_config_cleanup() is run on final drm_device cleanup is check the new error code for _init(). Aside: Another driver with a bit much devm_kzalloc, which should probably use drmm_kzalloc instead ... v2: Explain why this cleanup is possible (Laurent). v3: Use drmm_mode_config_init() for more clarity (Sam, Thomas) Cc: Sam Ravnborg Cc: Thomas Zimmermann Cc: Laurent Pinchart Signed-off-by: Daniel Vetter Acked-by: Sam Ravnborg --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 0563c6813333..2eaa9080d250 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -162,7 +162,9 @@ static int mtk_drm_kms_init(struct drm_device *drm) } private->mutex_dev = &pdev->dev; - drm_mode_config_init(drm); + ret = drmm_mode_config_init(drm); + if (ret) + return ret; drm->mode_config.min_width = 64; drm->mode_config.min_height = 64; @@ -179,7 +181,7 @@ static int mtk_drm_kms_init(struct drm_device *drm) ret = component_bind_all(drm->dev, drm); if (ret) - goto err_config_cleanup; + return ret; /* * We currently support two fixed data streams, each optional, @@ -255,8 +257,6 @@ static int mtk_drm_kms_init(struct drm_device *drm) dma_dev->dma_parms = NULL; err_component_unbind: component_unbind_all(drm->dev, drm); -err_config_cleanup: - drm_mode_config_cleanup(drm); return ret; } @@ -272,7 +272,6 @@ static void mtk_drm_kms_deinit(struct drm_device *drm) private->dma_dev->dma_parms = NULL; component_unbind_all(drm->dev, drm); - drm_mode_config_cleanup(drm); } static const struct file_operations mtk_drm_fops = {