From patchwork Wed Feb 19 10:21:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11391077 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 D8CB4930 for ; Wed, 19 Feb 2020 10:23:19 +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 B7FF32465D for ; Wed, 19 Feb 2020 10:23:19 +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="aJdVPPvs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B7FF32465D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E89986EB8D; Wed, 19 Feb 2020 10:22:33 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id 086D06EB65 for ; Wed, 19 Feb 2020 10:22:13 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id t23so5867896wmi.1 for ; Wed, 19 Feb 2020 02:22: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=25vbzSayYz4tsCja4oEl0jjU6qa/C5eQdgPoX3+bMwY=; b=aJdVPPvsEUM5Tgxf6K0zcH/K52kY4hhceMEQd6fmmXDplDdNIW2TMRK/3nZealgjUC iAycdS/aUX6Bx+cYjK1wtrgGx2Tsza/vsP8Sizag6bJMMhZCA9flNGWITQl7uAdyEFjW QokwF2+JtveLHWv0RitgROB4rCbY58l3E5bcI= 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=25vbzSayYz4tsCja4oEl0jjU6qa/C5eQdgPoX3+bMwY=; b=UXMyYyEbqukGhtZkYa8OeO5o+F4EsL+044sq7WmzgsimxQYnGuGri2Gw0KjmqHjpYH EZZG0LIyZ5zP6Fv3zydDi2FYXL77nKcV8jo32rNj65U/lfEG2XRkl3mzS2bYERnpGIax qnF5Jej1chnFkW+OEIs+BvjXey3zM2fHyOi47LjGOUItQ0fiprW3EBY7ean0a2XGWpi8 2eI8+PtKjY9/3EWyPNIhBH54dqJPpWXsC6oJEw0OQQjKBUaQ3qT2OhkAlIfJ5zxBmCy9 HnyBjbZX+0rKo+TakNKpKVNFMzNHfKt9yByPxf7n7RPn1AszJFWegc6NZxx21AB/d/tg ExsA== X-Gm-Message-State: APjAAAWBzF3q/Gs/Bhrm7Yl8DNueStWMSjf1ZcbpYYentVMc697TWpGo 2J0bcBL+QpsK3vEnGG+H4hhn7A== X-Google-Smtp-Source: APXvYqxXa0sdtFfSIHju33zRj3mM4bQHwhFa/kr5DYYF2IAo2ujg6UM+ukDH4e9O8EdGCR92VeC2ZA== X-Received: by 2002:a1c:df09:: with SMTP id w9mr8646262wmg.143.1582107731751; Wed, 19 Feb 2020 02:22:11 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id s23sm2370339wra.15.2020.02.19.02.22.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 02:22:11 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Wed, 19 Feb 2020 11:21:04 +0100 Message-Id: <20200219102122.1607365-35-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200219102122.1607365-1-daniel.vetter@ffwll.ch> References: <20200219102122.1607365-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 34/52] drm/mcde: More devm_drm_dev_init X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Linus Walleij , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Auto-unwind ftw, now possible with the fixed drm_device related management. Aside, clk/regulator seem to be missing devm versions for a bunch of functions, preventing a pile of these simpler drivers from outright losing their ->remove hook. Signed-off-by: Daniel Vetter Cc: Linus Walleij Reviewed-by: Linus Walleij --- drivers/gpu/drm/mcde/mcde_drv.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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; }