diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2023-04-16 18:50:39 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2023-04-16 20:11:53 +0200 |
| commit | 7f6f26d7adee150e09d7537acc6d6894c27c0b7a (patch) | |
| tree | 8706529cde6e982b9382fc6bf83b3ff470493342 /drivers/gpu/drm/tegra/nvdec.c | |
| parent | 116b1c5a364bcbdc40be64d4f3ec9dbc32e264dd (diff) | |
| parent | afa351a15d80993f8ba6ae28652cc23127237e37 (diff) | |
Merge drm/drm-next into drm-misc-next
Backmerging drm-next to sync with msm tree. Resolves a conflict
between aperture-helper changes and msm's use of those interfaces.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/gpu/drm/tegra/nvdec.c')
| -rw-r--r-- | drivers/gpu/drm/tegra/nvdec.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/gpu/drm/tegra/nvdec.c b/drivers/gpu/drm/tegra/nvdec.c index 86c5818ac27b..ae78a81e5eef 100644 --- a/drivers/gpu/drm/tegra/nvdec.c +++ b/drivers/gpu/drm/tegra/nvdec.c @@ -547,21 +547,13 @@ exit_falcon: return err; } -static int nvdec_remove(struct platform_device *pdev) +static void nvdec_remove(struct platform_device *pdev) { struct nvdec *nvdec = platform_get_drvdata(pdev); - int err; - err = host1x_client_unregister(&nvdec->client.base); - if (err < 0) { - dev_err(&pdev->dev, "failed to unregister host1x client: %d\n", - err); - return err; - } + host1x_client_unregister(&nvdec->client.base); falcon_exit(&nvdec->falcon); - - return 0; } static const struct dev_pm_ops nvdec_pm_ops = { @@ -577,7 +569,7 @@ struct platform_driver tegra_nvdec_driver = { .pm = &nvdec_pm_ops }, .probe = nvdec_probe, - .remove = nvdec_remove, + .remove_new = nvdec_remove, }; #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) |