Commit 68a72104 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Hans Verkuil
Browse files

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 0edb555a ("platform: Make
platform_driver::remove() return void"). Prepare for merging the patch by
switching the PiSP driver from remove to remove_new callback.

Fixes: 12187bd5 ("media: raspberrypi: Add support for PiSP BE")
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarNaushir Patuck <naush@raspberrypi.com>
Acked-by: default avatarJacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 1c2c57bd
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -1756,7 +1756,7 @@ static int pispbe_probe(struct platform_device *pdev)
	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,