summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2024-07-09 08:37:15 +0200
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2024-07-12 10:11:43 +0200
commit68a72104cbcf38ad16500216e213fa4eb21c4be2 (patch)
treeba0be8ec605a932d3bb6a7f274a366a26ce53c37 /drivers/media
parentmedia: uapi: pisp_be_config: Add extra config fields (diff)
downloadlinux-68a72104cbcf38ad16500216e213fa4eb21c4be2.tar.xz
linux-68a72104cbcf38ad16500216e213fa4eb21c4be2.zip
media: raspberrypi: Switch to remove_new
The remove callback's return value is about to change from int to void, this is done by commit 0edb555a65d1 ("platform: Make platform_driver::remove() return void"). Prepare for merging the patch by switching the PiSP driver from remove to remove_new callback. Fixes: 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE") Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Naushir Patuck <naush@raspberrypi.com> Acked-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Reviewed-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/raspberrypi/pisp_be/pisp_be.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
index e74df5b116dc..65ff2382cffe 100644
--- a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
+++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
@@ -1756,7 +1756,7 @@ pm_runtime_disable_err:
return ret;
}
-static int pispbe_remove(struct platform_device *pdev)
+static void pispbe_remove(struct platform_device *pdev)
{
struct pispbe_dev *pispbe = platform_get_drvdata(pdev);
@@ -1765,8 +1765,6 @@ static int pispbe_remove(struct platform_device *pdev)
pispbe_runtime_suspend(pispbe->dev);
pm_runtime_dont_use_autosuspend(pispbe->dev);
pm_runtime_disable(pispbe->dev);
-
- return 0;
}
static const struct dev_pm_ops pispbe_pm_ops = {
@@ -1783,7 +1781,7 @@ MODULE_DEVICE_TABLE(of, pispbe_of_match);
static struct platform_driver pispbe_pdrv = {
.probe = pispbe_probe,
- .remove = pispbe_remove,
+ .remove_new = pispbe_remove,
.driver = {
.name = PISPBE_NAME,
.of_match_table = pispbe_of_match,