Commit 1d83d1a2 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Thierry Reding

gpu: host1x: Make host1x_client_unregister() return void

This function returned zero unconditionally. Make it return no value and
simplify all callers accordingly.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 22b9442a
...@@ -3268,12 +3268,7 @@ static int tegra_dc_remove(struct platform_device *pdev) ...@@ -3268,12 +3268,7 @@ static int tegra_dc_remove(struct platform_device *pdev)
struct tegra_dc *dc = platform_get_drvdata(pdev); struct tegra_dc *dc = platform_get_drvdata(pdev);
int err; int err;
err = host1x_client_unregister(&dc->client); host1x_client_unregister(&dc->client);
if (err < 0) {
dev_err(&pdev->dev, "failed to unregister host1x client: %d\n",
err);
return err;
}
err = tegra_dc_rgb_remove(dc); err = tegra_dc_rgb_remove(dc);
if (err < 0) { if (err < 0) {
......
...@@ -1662,16 +1662,10 @@ static int tegra_dsi_probe(struct platform_device *pdev) ...@@ -1662,16 +1662,10 @@ static int tegra_dsi_probe(struct platform_device *pdev)
static int tegra_dsi_remove(struct platform_device *pdev) static int tegra_dsi_remove(struct platform_device *pdev)
{ {
struct tegra_dsi *dsi = platform_get_drvdata(pdev); struct tegra_dsi *dsi = platform_get_drvdata(pdev);
int err;
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
err = host1x_client_unregister(&dsi->client); host1x_client_unregister(&dsi->client);
if (err < 0) {
dev_err(&pdev->dev, "failed to unregister host1x client: %d\n",
err);
return err;
}
tegra_output_remove(&dsi->output); tegra_output_remove(&dsi->output);
......
...@@ -298,14 +298,8 @@ static int gr2d_probe(struct platform_device *pdev) ...@@ -298,14 +298,8 @@ static int gr2d_probe(struct platform_device *pdev)
static int gr2d_remove(struct platform_device *pdev) static int gr2d_remove(struct platform_device *pdev)
{ {
struct gr2d *gr2d = platform_get_drvdata(pdev); struct gr2d *gr2d = platform_get_drvdata(pdev);
int err;
err = host1x_client_unregister(&gr2d->client.base); host1x_client_unregister(&gr2d->client.base);
if (err < 0) {
dev_err(&pdev->dev, "failed to unregister host1x client: %d\n",
err);
return err;
}
return 0; return 0;
} }
......
...@@ -553,14 +553,8 @@ static int gr3d_probe(struct platform_device *pdev) ...@@ -553,14 +553,8 @@ static int gr3d_probe(struct platform_device *pdev)
static int gr3d_remove(struct platform_device *pdev) static int gr3d_remove(struct platform_device *pdev)
{ {
struct gr3d *gr3d = platform_get_drvdata(pdev); struct gr3d *gr3d = platform_get_drvdata(pdev);
int err;
err = host1x_client_unregister(&gr3d->client.base); host1x_client_unregister(&gr3d->client.base);
if (err < 0) {
dev_err(&pdev->dev, "failed to unregister host1x client: %d\n",
err);
return err;
}
return 0; return 0;
} }
......
...@@ -1877,14 +1877,8 @@ static int tegra_hdmi_probe(struct platform_device *pdev) ...@@ -1877,14 +1877,8 @@ static int tegra_hdmi_probe(struct platform_device *pdev)
static int tegra_hdmi_remove(struct platform_device *pdev) static int tegra_hdmi_remove(struct platform_device *pdev)
{ {
struct tegra_hdmi *hdmi = platform_get_drvdata(pdev); struct tegra_hdmi *hdmi = platform_get_drvdata(pdev);
int err;
err = host1x_client_unregister(&hdmi->client); host1x_client_unregister(&hdmi->client);
if (err < 0) {
dev_err(&pdev->dev, "failed to unregister host1x client: %d\n",
err);
return err;
}
tegra_output_remove(&hdmi->output); tegra_output_remove(&hdmi->output);
......
...@@ -1178,13 +1178,8 @@ static int tegra_display_hub_remove(struct platform_device *pdev) ...@@ -1178,13 +1178,8 @@ static int tegra_display_hub_remove(struct platform_device *pdev)
{ {
struct tegra_display_hub *hub = platform_get_drvdata(pdev); struct tegra_display_hub *hub = platform_get_drvdata(pdev);
unsigned int i; unsigned int i;
int err;
err = host1x_client_unregister(&hub->client); host1x_client_unregister(&hub->client);
if (err < 0) {
dev_err(&pdev->dev, "failed to unregister host1x client: %d\n",
err);
}
for (i = 0; i < hub->soc->num_wgrps; i++) { for (i = 0; i < hub->soc->num_wgrps; i++) {
struct tegra_windowgroup *wgrp = &hub->wgrps[i]; struct tegra_windowgroup *wgrp = &hub->wgrps[i];
...@@ -1194,7 +1189,7 @@ static int tegra_display_hub_remove(struct platform_device *pdev) ...@@ -1194,7 +1189,7 @@ static int tegra_display_hub_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
return err; return 0;
} }
static const struct tegra_display_hub_soc tegra186_display_hub = { static const struct tegra_display_hub_soc tegra186_display_hub = {
......
...@@ -550,14 +550,8 @@ static int nvdec_probe(struct platform_device *pdev) ...@@ -550,14 +550,8 @@ static int nvdec_probe(struct platform_device *pdev)
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;
err = host1x_client_unregister(&nvdec->client.base); host1x_client_unregister(&nvdec->client.base);
if (err < 0) {
dev_err(&pdev->dev, "failed to unregister host1x client: %d\n",
err);
return err;
}
falcon_exit(&nvdec->falcon); falcon_exit(&nvdec->falcon);
......
...@@ -3981,14 +3981,8 @@ static int tegra_sor_probe(struct platform_device *pdev) ...@@ -3981,14 +3981,8 @@ static int tegra_sor_probe(struct platform_device *pdev)
static int tegra_sor_remove(struct platform_device *pdev) static int tegra_sor_remove(struct platform_device *pdev)
{ {
struct tegra_sor *sor = platform_get_drvdata(pdev); struct tegra_sor *sor = platform_get_drvdata(pdev);
int err;
err = host1x_client_unregister(&sor->client); host1x_client_unregister(&sor->client);
if (err < 0) {
dev_err(&pdev->dev, "failed to unregister host1x client: %d\n",
err);
return err;
}
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
......
...@@ -540,14 +540,8 @@ static int vic_probe(struct platform_device *pdev) ...@@ -540,14 +540,8 @@ static int vic_probe(struct platform_device *pdev)
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;
err = host1x_client_unregister(&vic->client.base); host1x_client_unregister(&vic->client.base);
if (err < 0) {
dev_err(&pdev->dev, "failed to unregister host1x client: %d\n",
err);
return err;
}
falcon_exit(&vic->falcon); falcon_exit(&vic->falcon);
......
...@@ -803,7 +803,7 @@ EXPORT_SYMBOL(__host1x_client_register); ...@@ -803,7 +803,7 @@ EXPORT_SYMBOL(__host1x_client_register);
* Removes a host1x client from its host1x controller instance. If a logical * Removes a host1x client from its host1x controller instance. If a logical
* device has already been initialized, it will be torn down. * device has already been initialized, it will be torn down.
*/ */
int host1x_client_unregister(struct host1x_client *client) void host1x_client_unregister(struct host1x_client *client)
{ {
struct host1x_client *c; struct host1x_client *c;
struct host1x *host1x; struct host1x *host1x;
...@@ -815,7 +815,7 @@ int host1x_client_unregister(struct host1x_client *client) ...@@ -815,7 +815,7 @@ int host1x_client_unregister(struct host1x_client *client)
err = host1x_del_client(host1x, client); err = host1x_del_client(host1x, client);
if (!err) { if (!err) {
mutex_unlock(&devices_lock); mutex_unlock(&devices_lock);
return 0; return;
} }
} }
...@@ -832,8 +832,6 @@ int host1x_client_unregister(struct host1x_client *client) ...@@ -832,8 +832,6 @@ int host1x_client_unregister(struct host1x_client *client)
mutex_unlock(&clients_lock); mutex_unlock(&clients_lock);
host1x_bo_cache_destroy(&client->cache); host1x_bo_cache_destroy(&client->cache);
return 0;
} }
EXPORT_SYMBOL(host1x_client_unregister); EXPORT_SYMBOL(host1x_client_unregister);
......
...@@ -778,14 +778,8 @@ static int tegra_csi_probe(struct platform_device *pdev) ...@@ -778,14 +778,8 @@ static int tegra_csi_probe(struct platform_device *pdev)
static int tegra_csi_remove(struct platform_device *pdev) static int tegra_csi_remove(struct platform_device *pdev)
{ {
struct tegra_csi *csi = platform_get_drvdata(pdev); struct tegra_csi *csi = platform_get_drvdata(pdev);
int err;
err = host1x_client_unregister(&csi->client); host1x_client_unregister(&csi->client);
if (err < 0) {
dev_err(&pdev->dev,
"failed to unregister host1x client: %d\n", err);
return err;
}
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
......
...@@ -2041,14 +2041,8 @@ static int tegra_vi_probe(struct platform_device *pdev) ...@@ -2041,14 +2041,8 @@ static int tegra_vi_probe(struct platform_device *pdev)
static int tegra_vi_remove(struct platform_device *pdev) static int tegra_vi_remove(struct platform_device *pdev)
{ {
struct tegra_vi *vi = platform_get_drvdata(pdev); struct tegra_vi *vi = platform_get_drvdata(pdev);
int err;
err = host1x_client_unregister(&vi->client); host1x_client_unregister(&vi->client);
if (err < 0) {
dev_err(&pdev->dev,
"failed to unregister host1x client: %d\n", err);
return err;
}
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
......
...@@ -443,7 +443,7 @@ int __host1x_client_register(struct host1x_client *client); ...@@ -443,7 +443,7 @@ int __host1x_client_register(struct host1x_client *client);
__host1x_client_register(client); \ __host1x_client_register(client); \
}) })
int host1x_client_unregister(struct host1x_client *client); void host1x_client_unregister(struct host1x_client *client);
int host1x_client_suspend(struct host1x_client *client); int host1x_client_suspend(struct host1x_client *client);
int host1x_client_resume(struct host1x_client *client); int host1x_client_resume(struct host1x_client *client);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment