Message ID | 20200227181522.2711142-34-daniel.vetter@ffwll.ch (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=+bmb=4P=lists.freedesktop.org=dri-devel-bounces@kernel.org> 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 D4AC213A4 for <patchwork-dri-devel@patchwork.kernel.org>; Thu, 27 Feb 2020 18:17:05 +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 B3BB22469B for <patchwork-dri-devel@patchwork.kernel.org>; Thu, 27 Feb 2020 18:17:05 +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="g1nJ1GOE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B3BB22469B 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 367336ED12; Thu, 27 Feb 2020 18:16:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 324948926B for <dri-devel@lists.freedesktop.org>; Thu, 27 Feb 2020 18:16:13 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id z15so4673803wrl.1 for <dri-devel@lists.freedesktop.org>; Thu, 27 Feb 2020 10:16:13 -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=IUEc+CrkOe8AtWKYGxoHD/G/uVCfJzR2tmcYXyOAXL4=; b=g1nJ1GOEkCWCWepXpv5f0Owhj9hUVzZyyckW3u/polJaOAwPsd0YOm3A0vCNF1mKtE EAnm+r6BW3rqZbWq+3m+W8BEJaqt8idkobB5EnlHzVrE7/0sJjUV2NydfrLOAY7SDuZQ v0/UksYwRU+iihMX0jcXGXZH9MBJ5GH82Yrz0= 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=IUEc+CrkOe8AtWKYGxoHD/G/uVCfJzR2tmcYXyOAXL4=; b=fyjgTiat6oXzRrZLOrm8en0wFznSO9Wz1+KFP5+bEvMvH/0N4/9L7E9tZ9lMQU966o m1jwJj+RqsJZ4tt7hyPaem+yZUaqO8NMzZOE1q5SLKoId91vok5q5tCqtSwmEXdiUl7S rdVkXTYUtM+Tz+MkbNAMCmnkBOBP5O6L9fpB3tdFza2szzpUukVPpG7jDPr59id2EfFT uFvshIycP8gQsLb2qfGz3vPDfaiw7qTzee0WqM/E5bWDBYk51mVH6VOTh/WVIA8bIlUz 3RibUgI2RARIwWayN2DDDAcZbEL0Q695LEdAAcuCvc3ziFCK5nCpIdA7rhGrwFvBiV9O pRpw== X-Gm-Message-State: APjAAAUJBHkteqYyA7VbFoa/v7w+rVvfGebZNb8TIzAXNqePoFA0zvnX 5xfdeUi99zo7fTncYdwWuKGGYmDuDlA= X-Google-Smtp-Source: APXvYqyiyju0GFq+4Sw02NEEPCy0v5PMwcKgCtHB98ULfXCsw/lij5fBEAj5Q/jHwaCo2L6wedDNMw== X-Received: by 2002:adf:ef4f:: with SMTP id c15mr142303wrp.200.1582827371475; Thu, 27 Feb 2020 10:16:11 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id q1sm8551152wrw.5.2020.02.27.10.16.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 10:16:10 -0800 (PST) From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Subject: [PATCH 33/51] drm/mcde: More devm_drm_dev_init Date: Thu, 27 Feb 2020 19:15:04 +0100 Message-Id: <20200227181522.2711142-34-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200227181522.2711142-1-daniel.vetter@ffwll.ch> References: <20200227181522.2711142-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 <dri-devel.lists.freedesktop.org> List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <https://lists.freedesktop.org/archives/dri-devel> List-Post: <mailto:dri-devel@lists.freedesktop.org> List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help> List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, m.felsch@pengutronix.de, Daniel Vetter <daniel.vetter@intel.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org> |
Series |
drm managed resources, v3
|
expand
|
diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c index b8ca99995e51..3e92a44397cf 100644 --- a/drivers/gpu/drm/mcde/mcde_drv.c +++ b/drivers/gpu/drm/mcde/mcde_drv.c @@ -312,7 +312,7 @@ static int mcde_probe(struct platform_device *pdev) return -ENOMEM; mcde->dev = dev; - ret = drm_dev_init(&mcde->drm, &mcde_drm_driver, dev); + ret = devm_drm_dev_init(dev, &mcde->drm, &mcde_drm_driver); if (ret) { kfree(mcde); return ret; @@ -331,12 +331,12 @@ static int mcde_probe(struct platform_device *pdev) if (IS_ERR(mcde->epod)) { ret = PTR_ERR(mcde->epod); dev_err(dev, "can't get EPOD regulator\n"); - goto dev_unref; + return ret; } ret = regulator_enable(mcde->epod); if (ret) { dev_err(dev, "can't enable EPOD regulator\n"); - goto dev_unref; + return ret; } mcde->vana = devm_regulator_get(dev, "vana"); if (IS_ERR(mcde->vana)) { @@ -487,8 +487,6 @@ static int mcde_probe(struct platform_device *pdev) regulator_disable(mcde->vana); regulator_epod_off: regulator_disable(mcde->epod); -dev_unref: - drm_dev_put(drm); return ret; } @@ -502,7 +500,6 @@ static int mcde_remove(struct platform_device *pdev) clk_disable_unprepare(mcde->mcde_clk); regulator_disable(mcde->vana); regulator_disable(mcde->epod); - drm_dev_put(drm); return 0; }