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>
This commit is contained in:
parent
1c2c57bd43
commit
68a72104cb
@ -1756,7 +1756,7 @@ pm_runtime_disable_err:
|
|||||||
return ret;
|
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);
|
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);
|
pispbe_runtime_suspend(pispbe->dev);
|
||||||
pm_runtime_dont_use_autosuspend(pispbe->dev);
|
pm_runtime_dont_use_autosuspend(pispbe->dev);
|
||||||
pm_runtime_disable(pispbe->dev);
|
pm_runtime_disable(pispbe->dev);
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct dev_pm_ops pispbe_pm_ops = {
|
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 = {
|
static struct platform_driver pispbe_pdrv = {
|
||||||
.probe = pispbe_probe,
|
.probe = pispbe_probe,
|
||||||
.remove = pispbe_remove,
|
.remove_new = pispbe_remove,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = PISPBE_NAME,
|
.name = PISPBE_NAME,
|
||||||
.of_match_table = pispbe_of_match,
|
.of_match_table = pispbe_of_match,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user