From patchwork Thu Feb 27 18:15:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11409267 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 5E83E13A4 for ; Thu, 27 Feb 2020 18:16:49 +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 3D2592469B for ; Thu, 27 Feb 2020 18:16:49 +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="CDTlMh0A" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D2592469B 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 C31CE6E954; Thu, 27 Feb 2020 18:16:13 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@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 E33A16E954 for ; Thu, 27 Feb 2020 18:16:08 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id c13so4606012wrq.10 for ; Thu, 27 Feb 2020 10:16:08 -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=fC4celYl+zitDraKVjI6Hb1oSvmWpkdE1ngLFdboeds=; b=CDTlMh0AnvNK/Hdxi9z0+dkNWm8+NXNvjG3KcbS/5D70aUNHTkzpvh5E//80MNm3QX v6QPodBCyFaiqwhon/unIZEHDcVM4hFWlUHegE04wF1G5wyU8IPHGrYlwNYlZaWmiQog QPJOBRvFrDHfvSzJ7RS1tXs/aihf0Hkie8JJ0= 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=fC4celYl+zitDraKVjI6Hb1oSvmWpkdE1ngLFdboeds=; b=WQ0Ivb8Qz7UzHvlmKXKeuDUudraJQj9cDnFBjP/Zz73QN1M38OCcz6LTO+UzTlkB5U aYpBhnZ1gcH+7yUDtz6bIdSrhHJmjSQ+5gRTF128acoAmZb06DGyIQmv9cbhMKHgqVbW JpaW0aBtoR3a0Z59Y601amf4eVPkxKKREuELAgDSMc/x+iwbHWsWqcMctDfnkQfenhYc bPXcsljKObeeUaZjTNKZxeMppuXm5lfzzne4piJFZZm2QsA/DVNW1kf7b10gK4V+678r z7yPRmrqRcplf8x2Xbast+Lug2VEg62xsTzCGAgeJZsDHtVsIgBcjqvLgt/Ssypmqq9G K9XA== X-Gm-Message-State: APjAAAU22lbem9xh+cVkRrflfO8/lZ32qcr9Hf3EdS4b3FQRZ5Ba72p6 vJGE4KxFWs1vMozNf26WM6sX9w== X-Google-Smtp-Source: APXvYqxNOrW8nk0qHk7r0x8vuing2HlFzdeaEB/C5GOp5TbPM3tClNjG1oFjxsmUQ0qvF/kIebvtBA== X-Received: by 2002:adf:82a3:: with SMTP id 32mr131227wrc.290.1582827367641; Thu, 27 Feb 2020 10:16:07 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 10:16:06 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Thu, 27 Feb 2020 19:15:01 +0100 Message-Id: <20200227181522.2711142-31-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 Subject: [Intel-gfx] [PATCH 30/51] drm/cirrus: Fully embrace devm_ 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 , m.felsch@pengutronix.de, virtualization@lists.linux-foundation.org, =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Gerd Hoffmann , Thomas Zimmermann , Dave Airlie , Daniel Vetter , Emil Velikov , l.stach@pengutronix.de Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" With the drm_device lifetime fun cleaned up there's nothing in the way anymore to use devm_ for everything hw releated. Do it, and in the process, throw out the entire onion unwinding. Signed-off-by: Daniel Vetter Cc: Dave Airlie Cc: Gerd Hoffmann Cc: Daniel Vetter Cc: "Noralf Trønnes" Cc: Emil Velikov Cc: Thomas Zimmermann Cc: virtualization@lists.linux-foundation.org --- drivers/gpu/drm/cirrus/cirrus.c | 44 +++++++++++---------------------- 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/cirrus/cirrus.c b/drivers/gpu/drm/cirrus/cirrus.c index 6ac0286810ec..1b78a2f88f69 100644 --- a/drivers/gpu/drm/cirrus/cirrus.c +++ b/drivers/gpu/drm/cirrus/cirrus.c @@ -558,7 +558,7 @@ static int cirrus_pci_probe(struct pci_dev *pdev, if (ret) return ret; - ret = pci_enable_device(pdev); + ret = pcim_enable_device(pdev); if (ret) return ret; @@ -569,39 +569,38 @@ static int cirrus_pci_probe(struct pci_dev *pdev, ret = -ENOMEM; cirrus = kzalloc(sizeof(*cirrus), GFP_KERNEL); if (cirrus == NULL) - goto err_pci_release; + return ret; dev = &cirrus->dev; - ret = drm_dev_init(dev, &cirrus_driver, &pdev->dev); + ret = devm_drm_dev_init(&pdev->dev, dev, &cirrus_driver); if (ret) { kfree(cirrus); - goto err_pci_release; + return ret; } dev->dev_private = cirrus; drmm_add_final_kfree(dev, cirrus); - ret = -ENOMEM; - cirrus->vram = ioremap(pci_resource_start(pdev, 0), - pci_resource_len(pdev, 0)); + cirrus->vram = devm_ioremap(&pdev->dev, pci_resource_start(pdev, 0), + pci_resource_len(pdev, 0)); if (cirrus->vram == NULL) - goto err_dev_put; + return -ENOMEM; - cirrus->mmio = ioremap(pci_resource_start(pdev, 1), - pci_resource_len(pdev, 1)); + cirrus->mmio = devm_ioremap(&pdev->dev, pci_resource_start(pdev, 1), + pci_resource_len(pdev, 1)); if (cirrus->mmio == NULL) - goto err_unmap_vram; + return -ENOMEM; ret = cirrus_mode_config_init(cirrus); if (ret) - goto err_cleanup; + return ret; ret = cirrus_conn_init(cirrus); if (ret < 0) - goto err_cleanup; + return ret; ret = cirrus_pipe_init(cirrus); if (ret < 0) - goto err_cleanup; + return ret; drm_mode_config_reset(dev); @@ -609,33 +608,18 @@ static int cirrus_pci_probe(struct pci_dev *pdev, pci_set_drvdata(pdev, dev); ret = drm_dev_register(dev, 0); if (ret) - goto err_cleanup; + return ret; drm_fbdev_generic_setup(dev, dev->mode_config.preferred_depth); return 0; - -err_cleanup: - iounmap(cirrus->mmio); -err_unmap_vram: - iounmap(cirrus->vram); -err_dev_put: - drm_dev_put(dev); -err_pci_release: - pci_release_regions(pdev); - return ret; } static void cirrus_pci_remove(struct pci_dev *pdev) { struct drm_device *dev = pci_get_drvdata(pdev); - struct cirrus_device *cirrus = dev->dev_private; drm_dev_unplug(dev); drm_atomic_helper_shutdown(dev); - iounmap(cirrus->mmio); - iounmap(cirrus->vram); - drm_dev_put(dev); - pci_release_regions(pdev); } static const struct pci_device_id pciidlist[] = {