From: "Clément Péron" <peron.clem@gmail.com> To: Rob Herring <robh@kernel.org>, Tomeu Vizoso <tomeu.vizoso@collabora.com>, Steven Price <steven.price@arm.com>, Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>, Viresh Kumar <vireshk@kernel.org>, Nishanth Menon <nm@ti.com>, Stephen Boyd <sboyd@kernel.org>, Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org> Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, "Clément Péron" <peron.clem@gmail.com> Subject: [PATCH v4 07/14] drm/panfrost: rename error labels in device_init Date: Fri, 10 Jul 2020 11:25:41 +0200 [thread overview] Message-ID: <20200710092548.316054-8-peron.clem@gmail.com> (raw) In-Reply-To: <20200710092548.316054-1-peron.clem@gmail.com> Rename goto labels in device_init it will be easier to maintain. Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Reviewed-by: Steven Price <steven.price@arm.com> Signed-off-by: Clément Péron <peron.clem@gmail.com> --- drivers/gpu/drm/panfrost/panfrost_device.c | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index b172087eee6a..9f89984f652a 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -216,56 +216,56 @@ int panfrost_device_init(struct panfrost_device *pfdev) err = panfrost_regulator_init(pfdev); if (err) - goto err_out0; + goto out_clk; err = panfrost_reset_init(pfdev); if (err) { dev_err(pfdev->dev, "reset init failed %d\n", err); - goto err_out1; + goto out_regulator; } err = panfrost_pm_domain_init(pfdev); if (err) - goto err_out2; + goto out_reset; res = platform_get_resource(pfdev->pdev, IORESOURCE_MEM, 0); pfdev->iomem = devm_ioremap_resource(pfdev->dev, res); if (IS_ERR(pfdev->iomem)) { dev_err(pfdev->dev, "failed to ioremap iomem\n"); err = PTR_ERR(pfdev->iomem); - goto err_out3; + goto out_pm_domain; } err = panfrost_gpu_init(pfdev); if (err) - goto err_out3; + goto out_pm_domain; err = panfrost_mmu_init(pfdev); if (err) - goto err_out4; + goto out_gpu; err = panfrost_job_init(pfdev); if (err) - goto err_out5; + goto out_mmu; err = panfrost_perfcnt_init(pfdev); if (err) - goto err_out6; + goto out_job; return 0; -err_out6: +out_job: panfrost_job_fini(pfdev); -err_out5: +out_mmu: panfrost_mmu_fini(pfdev); -err_out4: +out_gpu: panfrost_gpu_fini(pfdev); -err_out3: +out_pm_domain: panfrost_pm_domain_fini(pfdev); -err_out2: +out_reset: panfrost_reset_fini(pfdev); -err_out1: +out_regulator: panfrost_regulator_fini(pfdev); -err_out0: +out_clk: panfrost_clk_fini(pfdev); return err; } -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: "Clément Péron" <peron.clem@gmail.com> To: Rob Herring <robh@kernel.org>, Tomeu Vizoso <tomeu.vizoso@collabora.com>, Steven Price <steven.price@arm.com>, Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>, Viresh Kumar <vireshk@kernel.org>, Nishanth Menon <nm@ti.com>, Stephen Boyd <sboyd@kernel.org>, Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org> Cc: "Clément Péron" <peron.clem@gmail.com>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v4 07/14] drm/panfrost: rename error labels in device_init Date: Fri, 10 Jul 2020 11:25:41 +0200 [thread overview] Message-ID: <20200710092548.316054-8-peron.clem@gmail.com> (raw) In-Reply-To: <20200710092548.316054-1-peron.clem@gmail.com> Rename goto labels in device_init it will be easier to maintain. Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Reviewed-by: Steven Price <steven.price@arm.com> Signed-off-by: Clément Péron <peron.clem@gmail.com> --- drivers/gpu/drm/panfrost/panfrost_device.c | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index b172087eee6a..9f89984f652a 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -216,56 +216,56 @@ int panfrost_device_init(struct panfrost_device *pfdev) err = panfrost_regulator_init(pfdev); if (err) - goto err_out0; + goto out_clk; err = panfrost_reset_init(pfdev); if (err) { dev_err(pfdev->dev, "reset init failed %d\n", err); - goto err_out1; + goto out_regulator; } err = panfrost_pm_domain_init(pfdev); if (err) - goto err_out2; + goto out_reset; res = platform_get_resource(pfdev->pdev, IORESOURCE_MEM, 0); pfdev->iomem = devm_ioremap_resource(pfdev->dev, res); if (IS_ERR(pfdev->iomem)) { dev_err(pfdev->dev, "failed to ioremap iomem\n"); err = PTR_ERR(pfdev->iomem); - goto err_out3; + goto out_pm_domain; } err = panfrost_gpu_init(pfdev); if (err) - goto err_out3; + goto out_pm_domain; err = panfrost_mmu_init(pfdev); if (err) - goto err_out4; + goto out_gpu; err = panfrost_job_init(pfdev); if (err) - goto err_out5; + goto out_mmu; err = panfrost_perfcnt_init(pfdev); if (err) - goto err_out6; + goto out_job; return 0; -err_out6: +out_job: panfrost_job_fini(pfdev); -err_out5: +out_mmu: panfrost_mmu_fini(pfdev); -err_out4: +out_gpu: panfrost_gpu_fini(pfdev); -err_out3: +out_pm_domain: panfrost_pm_domain_fini(pfdev); -err_out2: +out_reset: panfrost_reset_fini(pfdev); -err_out1: +out_regulator: panfrost_regulator_fini(pfdev); -err_out0: +out_clk: panfrost_clk_fini(pfdev); return err; } -- 2.25.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-07-10 9:26 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-10 9:25 [PATCH v4 00/14] Add regulator devfreq support to Panfrost Clément Péron 2020-07-10 9:25 ` Clément Péron 2020-07-10 9:25 ` [PATCH v4 01/14] drm/panfrost: avoid static declaration Clément Péron 2020-07-10 9:25 ` Clément Péron 2020-07-10 9:25 ` [PATCH v4 02/14] drm/panfrost: clean headers in devfreq Clément Péron 2020-07-10 9:25 ` Clément Péron 2020-07-10 9:25 ` [PATCH v4 03/14] drm/panfrost: don't use pfdevfreq.busy_count to know if hw is idle Clément Péron 2020-07-10 9:25 ` Clément Péron 2020-07-10 9:25 ` [PATCH v4 04/14] drm/panfrost: introduce panfrost_devfreq struct Clément Péron 2020-07-10 9:25 ` Clément Péron 2020-07-10 9:46 ` Clément Péron 2020-07-10 9:46 ` Clément Péron 2020-07-10 9:25 ` [PATCH v4 05/14] drm/panfrost: use spinlock instead of atomic Clément Péron 2020-07-10 9:25 ` Clément Péron 2020-07-10 9:25 ` [PATCH v4 06/14] drm/panfrost: properly handle error in probe Clément Péron 2020-07-10 9:25 ` Clément Péron 2020-07-10 9:25 ` Clément Péron [this message] 2020-07-10 9:25 ` [PATCH v4 07/14] drm/panfrost: rename error labels in device_init Clément Péron 2020-07-10 9:25 ` [PATCH v4 08/14] drm/panfrost: move devfreq_init()/fini() in device Clément Péron 2020-07-10 9:25 ` Clément Péron 2020-07-10 9:25 ` [PATCH v4 09/14] drm/panfrost: dynamically alloc regulators Clément Péron 2020-07-10 9:25 ` Clément Péron 2020-07-10 9:25 ` [PATCH v4 10/14] drm/panfrost: add regulators to devfreq Clément Péron 2020-07-10 9:25 ` Clément Péron 2020-07-10 9:25 ` [PATCH v4 11/14] arm64: defconfig: Enable devfreq cooling device Clément Péron 2020-07-10 9:25 ` Clément Péron 2020-07-10 9:25 ` [PATCH v4 12/14] arm64: dts: allwinner: h6: Add cooling map for GPU Clément Péron 2020-07-10 9:25 ` Clément Péron 2020-07-10 9:25 ` [PATCH v4 13/14] [DO NOT MERGE] arm64: dts: allwinner: h6: Add GPU OPP table Clément Péron 2020-07-10 9:25 ` Clément Péron 2020-07-10 9:25 ` [PATCH v4 14/14] [DO NOT MERGE] arm64: dts: allwinner: force GPU regulator to be always Clément Péron 2020-07-10 9:25 ` Clément Péron
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200710092548.316054-8-peron.clem@gmail.com \ --to=peron.clem@gmail.com \ --cc=alyssa.rosenzweig@collabora.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mripard@kernel.org \ --cc=nm@ti.com \ --cc=robh@kernel.org \ --cc=sboyd@kernel.org \ --cc=steven.price@arm.com \ --cc=tomeu.vizoso@collabora.com \ --cc=vireshk@kernel.org \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.