anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "media: rcar_fdp1: Convert to platform remove callback returning void"

Browse Source 
This reverts commit 5847021f80 which is
commit 0e82d3715fd208de567b8e4307fbf91ae5e57db4 upstream.

The remove_new abi change is not needed for Android systems, so revert
it for now.  The original bug that this change was needed is still
resolved properly.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I70d8f248d78819b8dbb7c901dff3387440b22d4c
This commit is contained in:
Greg Kroah-Hartman
2023-06-23 13:58:38 +00:00
parent ab69d69bc3
commit e776ba0959
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/platform/rcar_fdp1.c
View File

@@ -2400,7 +2400,7 @@ put_dev:
return ret;
}
static void fdp1_remove(struct platform_device *pdev)
static int fdp1_remove(struct platform_device *pdev)
{
struct fdp1_dev *fdp1 = platform_get_drvdata(pdev);
@@ -2409,6 +2409,7 @@ static void fdp1_remove(struct platform_device *pdev)
v4l2_device_unregister(&fdp1->v4l2_dev);
pm_runtime_disable(&pdev->dev);
rcar_fcp_put(fdp1->fcp);
return 0;
}
static int __maybe_unused fdp1_pm_runtime_suspend(struct device *dev)
@@ -2444,7 +2445,7 @@ MODULE_DEVICE_TABLE(of, fdp1_dt_ids);
static struct platform_driver fdp1_pdrv = {
.probe = fdp1_probe,
.remove_new = fdp1_remove,
.remove = fdp1_remove,
.driver = {
.name = DRIVER_NAME,
.of_match_table = fdp1_dt_ids,