From 07dbfa8de120728ebe76d7fe689f80f11d2c9a24 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Wed, 27 Sep 2023 13:13:43 +0100 Subject: [PATCH] gpu: host1x: Make host1x_actmon_unregister() return void The function host1x_actmon_unregister() never fails and so never returns an error. Make this function return void to simplify the code. Bug 4303860 Change-Id: I9e1cd403bd6db8e2d4ac6831ed26e1436638456f Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2986789 Reviewed-by: Mikko Perttunen GVS: Gerrit_Virtual_Submit --- drivers/gpu/drm/tegra/nvdec.c | 6 +----- drivers/gpu/drm/tegra/nvenc.c | 6 +----- drivers/gpu/drm/tegra/nvjpg.c | 6 +----- drivers/gpu/drm/tegra/vic.c | 6 +----- drivers/gpu/host1x/actmon.c | 8 +++----- drivers/gpu/host1x/include/linux/host1x-next.h | 2 +- 6 files changed, 8 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/tegra/nvdec.c b/drivers/gpu/drm/tegra/nvdec.c index f483e2e1..6bd7c57a 100644 --- a/drivers/gpu/drm/tegra/nvdec.c +++ b/drivers/gpu/drm/tegra/nvdec.c @@ -859,16 +859,12 @@ exit_falcon: static int nvdec_remove(struct platform_device *pdev) { struct nvdec *nvdec = platform_get_drvdata(pdev); - int err; pm_runtime_disable(&pdev->dev); nvdec_devfreq_deinit(nvdec); - err = host1x_actmon_unregister(&nvdec->client.base); - if (err < 0) - dev_info(&pdev->dev, "failed to unregister host1x actmon: %d\n", - err); + host1x_actmon_unregister(&nvdec->client.base); host1x_client_unregister(&nvdec->client.base); diff --git a/drivers/gpu/drm/tegra/nvenc.c b/drivers/gpu/drm/tegra/nvenc.c index 62c633db..f19f02ed 100644 --- a/drivers/gpu/drm/tegra/nvenc.c +++ b/drivers/gpu/drm/tegra/nvenc.c @@ -725,16 +725,12 @@ exit_falcon: static int nvenc_remove(struct platform_device *pdev) { struct nvenc *nvenc = platform_get_drvdata(pdev); - int err; pm_runtime_disable(&pdev->dev); nvenc_devfreq_deinit(nvenc); - err = host1x_actmon_unregister(&nvenc->client.base); - if (err < 0) - dev_info(&pdev->dev, "failed to unregister host1x actmon: %d\n", - err); + host1x_actmon_unregister(&nvenc->client.base); host1x_client_unregister(&nvenc->client.base); diff --git a/drivers/gpu/drm/tegra/nvjpg.c b/drivers/gpu/drm/tegra/nvjpg.c index 00dab9ed..cd40b3fe 100644 --- a/drivers/gpu/drm/tegra/nvjpg.c +++ b/drivers/gpu/drm/tegra/nvjpg.c @@ -712,16 +712,12 @@ exit_falcon: static int nvjpg_remove(struct platform_device *pdev) { struct nvjpg *nvjpg = platform_get_drvdata(pdev); - int err; pm_runtime_disable(&pdev->dev); nvjpg_devfreq_deinit(nvjpg); - err = host1x_actmon_unregister(&nvjpg->client.base); - if (err < 0) - dev_info(&pdev->dev, "failed to unregister host1x actmon: %d\n", - err); + host1x_actmon_unregister(&nvjpg->client.base); host1x_client_unregister(&nvjpg->client.base); diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index a1de0db7..e8251088 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -793,16 +793,12 @@ exit_falcon: static int vic_remove(struct platform_device *pdev) { struct vic *vic = platform_get_drvdata(pdev); - int err; pm_runtime_disable(&pdev->dev); vic_devfreq_deinit(vic); - err = host1x_actmon_unregister(&vic->client.base); - if (err < 0) - dev_info(&pdev->dev, "failed to unregister host1x actmon: %d\n", - err); + host1x_actmon_unregister(&vic->client.base); host1x_client_unregister(&vic->client.base); diff --git a/drivers/gpu/host1x/actmon.c b/drivers/gpu/host1x/actmon.c index 93eda9d4..51c22310 100644 --- a/drivers/gpu/host1x/actmon.c +++ b/drivers/gpu/host1x/actmon.c @@ -388,7 +388,7 @@ int host1x_actmon_register(struct host1x_client *client) } EXPORT_SYMBOL(host1x_actmon_register); -int host1x_actmon_unregister(struct host1x_client *client) +void host1x_actmon_unregister(struct host1x_client *client) { struct host1x_actmon_module *module; struct host1x *host = dev_get_drvdata(client->host->parent); @@ -397,10 +397,10 @@ int host1x_actmon_unregister(struct host1x_client *client) int i; if (!host->actmon_regs || !host->actmon_clk) - return 0; + return; if (!actmon) - return 0; + return; for (i = 0; i < actmon->num_modules; i++) { module = &actmon->modules[i]; @@ -415,8 +415,6 @@ int host1x_actmon_unregister(struct host1x_client *client) spin_lock_irqsave(&host->actmons_lock, flags); list_del(&actmon->list); spin_unlock_irqrestore(&host->actmons_lock, flags); - - return 0; } EXPORT_SYMBOL(host1x_actmon_unregister); diff --git a/drivers/gpu/host1x/include/linux/host1x-next.h b/drivers/gpu/host1x/include/linux/host1x-next.h index 7d7e7af3..f7e123e8 100644 --- a/drivers/gpu/host1x/include/linux/host1x-next.h +++ b/drivers/gpu/host1x/include/linux/host1x-next.h @@ -526,7 +526,7 @@ static inline void host1x_memory_context_put(struct host1x_memory_context *cd) int host1x_actmon_read_avg_count(struct host1x_client *client); int host1x_actmon_register(struct host1x_client *client); -int host1x_actmon_unregister(struct host1x_client *client); +void host1x_actmon_unregister(struct host1x_client *client); void host1x_actmon_enable(struct host1x_client *client); void host1x_actmon_disable(struct host1x_client *client); void host1x_actmon_update_client_rate(struct host1x_client *client,