Skip to content

Commit 68a7210

Browse files
sfrothwellHans Verkuil
authored andcommitted
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 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 <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>
1 parent 1c2c57b commit 68a7210

File tree

1 file changed

+2
-4
lines changed
  • drivers/media/platform/raspberrypi/pisp_be

1 file changed

+2
-4
lines changed

drivers/media/platform/raspberrypi/pisp_be/pisp_be.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1756,7 +1756,7 @@ static int pispbe_probe(struct platform_device *pdev)
17561756
return ret;
17571757
}
17581758

1759-
static int pispbe_remove(struct platform_device *pdev)
1759+
static void pispbe_remove(struct platform_device *pdev)
17601760
{
17611761
struct pispbe_dev *pispbe = platform_get_drvdata(pdev);
17621762

@@ -1765,8 +1765,6 @@ static int pispbe_remove(struct platform_device *pdev)
17651765
pispbe_runtime_suspend(pispbe->dev);
17661766
pm_runtime_dont_use_autosuspend(pispbe->dev);
17671767
pm_runtime_disable(pispbe->dev);
1768-
1769-
return 0;
17701768
}
17711769

17721770
static const struct dev_pm_ops pispbe_pm_ops = {
@@ -1783,7 +1781,7 @@ MODULE_DEVICE_TABLE(of, pispbe_of_match);
17831781

17841782
static struct platform_driver pispbe_pdrv = {
17851783
.probe = pispbe_probe,
1786-
.remove = pispbe_remove,
1784+
.remove_new = pispbe_remove,
17871785
.driver = {
17881786
.name = PISPBE_NAME,
17891787
.of_match_table = pispbe_of_match,

0 commit comments

Comments
 (0)