From 9325fcde01e43600a0db9cd8e806cea1fa1770da Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 9 Jun 2023 11:49:21 +0000 Subject: [PATCH] Revert "media: rcar_fdp1: Convert to platform remove callback returning void" This reverts commit 5847021f8052ff20fc37e8cc49d97115cc824de0, which is commit 0e82d3715fd208de567b8e4307fbf91ae5e57db4 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 --- drivers/media/platform/rcar_fdp1.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/rcar_fdp1.c index c548cb01957b..dea22e357905 100644 --- a/drivers/media/platform/rcar_fdp1.c +++ b/drivers/media/platform/rcar_fdp1.c @@ -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,