shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-25 20:10:23 +09:00
Code Issues 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 0e82d3715f upstream.

It is not needed, and the platform driver callback is being reverted
back to the original name due to ABI issues, so to preserve the build,
this change needs to be reverted.

Bug: 161946584
Change-Id: I3bf75891ff20070ab390f3490de6e77b9b907165
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-06-09 11:49:21 +00:00
parent c2773262b8
commit 9325fcde01
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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,8 @@ 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 +2446,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,