Skip to content

Commit

Permalink
media: raspberrypi: Switch to remove_new
Browse files Browse the repository at this point in the history
The remove callback's return value is about to change from int to void,
this is done by commit 0edb555 ("platform: Make
platform_driver::remove() return void"). Prepare for merging the patch by
switching the PiSP driver from remove to remove_new callback.

Fixes: 12187bd ("media: raspberrypi: Add support for PiSP BE")
Signed-off-by: Stephen Rothwell <[email protected]>
Acked-by: Naushir Patuck <[email protected]>
Acked-by: Jacopo Mondi <[email protected]>
Signed-off-by: Sakari Ailus <[email protected]>
Reviewed-by: Uwe Kleine-König <[email protected]>
Signed-off-by: Hans Verkuil <[email protected]>
  • Loading branch information
sfrothwell authored and Hans Verkuil committed Jul 12, 2024
1 parent 1c2c57b commit 68a7210
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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 = {
Expand All @@ -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,
Expand Down

0 comments on commit 68a7210

Please sign in to comment.