nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: host1x: Make host1x_actmon_unregister() return void

Browse Source 
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 <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2986789
Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Jon Hunter
2023-09-27 13:13:43 +01:00
committed by mobile promotions
parent ee866593b7
commit 07dbfa8de1
6 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/tegra/nvdec.c
View File

@@ -859,16 +859,12 @@ exit_falcon:
static int nvdec_remove(struct platform_device *pdev) static int nvdec_remove(struct platform_device *pdev)
{ {
struct nvdec *nvdec = platform_get_drvdata(pdev); struct nvdec *nvdec = platform_get_drvdata(pdev);
int err;
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
nvdec_devfreq_deinit(nvdec); nvdec_devfreq_deinit(nvdec);
err = host1x_actmon_unregister(&nvdec->client.base); host1x_actmon_unregister(&nvdec->client.base);
if (err < 0)
dev_info(&pdev->dev, "failed to unregister host1x actmon: %d\n",
err);
host1x_client_unregister(&nvdec->client.base); host1x_client_unregister(&nvdec->client.base);

6
drivers/gpu/drm/tegra/nvenc.c
View File

@@ -725,16 +725,12 @@ exit_falcon:
static int nvenc_remove(struct platform_device *pdev) static int nvenc_remove(struct platform_device *pdev)
{ {
struct nvenc *nvenc = platform_get_drvdata(pdev); struct nvenc *nvenc = platform_get_drvdata(pdev);
int err;
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
nvenc_devfreq_deinit(nvenc); nvenc_devfreq_deinit(nvenc);
err = host1x_actmon_unregister(&nvenc->client.base); host1x_actmon_unregister(&nvenc->client.base);
if (err < 0)
dev_info(&pdev->dev, "failed to unregister host1x actmon: %d\n",
err);
host1x_client_unregister(&nvenc->client.base); host1x_client_unregister(&nvenc->client.base);

6
drivers/gpu/drm/tegra/nvjpg.c
View File

@@ -712,16 +712,12 @@ exit_falcon:
static int nvjpg_remove(struct platform_device *pdev) static int nvjpg_remove(struct platform_device *pdev)
{ {
struct nvjpg *nvjpg = platform_get_drvdata(pdev); struct nvjpg *nvjpg = platform_get_drvdata(pdev);
int err;
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
nvjpg_devfreq_deinit(nvjpg); nvjpg_devfreq_deinit(nvjpg);
err = host1x_actmon_unregister(&nvjpg->client.base); host1x_actmon_unregister(&nvjpg->client.base);
if (err < 0)
dev_info(&pdev->dev, "failed to unregister host1x actmon: %d\n",
err);
host1x_client_unregister(&nvjpg->client.base); host1x_client_unregister(&nvjpg->client.base);

6
drivers/gpu/drm/tegra/vic.c
View File

@@ -793,16 +793,12 @@ exit_falcon:
static int vic_remove(struct platform_device *pdev) static int vic_remove(struct platform_device *pdev)
{ {
struct vic *vic = platform_get_drvdata(pdev); struct vic *vic = platform_get_drvdata(pdev);
int err;
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
vic_devfreq_deinit(vic); vic_devfreq_deinit(vic);
err = host1x_actmon_unregister(&vic->client.base); host1x_actmon_unregister(&vic->client.base);
if (err < 0)
dev_info(&pdev->dev, "failed to unregister host1x actmon: %d\n",
err);
host1x_client_unregister(&vic->client.base); host1x_client_unregister(&vic->client.base);

8
drivers/gpu/host1x/actmon.c
View File

@@ -388,7 +388,7 @@ int host1x_actmon_register(struct host1x_client *client)
} }
EXPORT_SYMBOL(host1x_actmon_register); 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_actmon_module *module;
struct host1x *host = dev_get_drvdata(client->host->parent); struct host1x *host = dev_get_drvdata(client->host->parent);
@@ -397,10 +397,10 @@ int host1x_actmon_unregister(struct host1x_client *client)
int i; int i;
if (!host->actmon_regs || !host->actmon_clk) if (!host->actmon_regs || !host->actmon_clk)
return 0; return;
if (!actmon) if (!actmon)
return 0; return;
for (i = 0; i < actmon->num_modules; i++) { for (i = 0; i < actmon->num_modules; i++) {
module = &actmon->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); spin_lock_irqsave(&host->actmons_lock, flags);
list_del(&actmon->list); list_del(&actmon->list);
spin_unlock_irqrestore(&host->actmons_lock, flags); spin_unlock_irqrestore(&host->actmons_lock, flags);
return 0;
} }
EXPORT_SYMBOL(host1x_actmon_unregister); EXPORT_SYMBOL(host1x_actmon_unregister);

2
drivers/gpu/host1x/include/linux/host1x-next.h
View File

@@ -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_read_avg_count(struct host1x_client *client);
int host1x_actmon_register(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_enable(struct host1x_client *client);
void host1x_actmon_disable(struct host1x_client *client); void host1x_actmon_disable(struct host1x_client *client);
void host1x_actmon_update_client_rate(struct host1x_client *client, void host1x_actmon_update_client_rate(struct host1x_client *client,