[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240709161735.3724913-1-sakari.ailus@linux.intel.com>
Date: Tue, 9 Jul 2024 19:17:35 +0300
From: Sakari Ailus <sakari.ailus@...ux.intel.com>
To: linux-media@...r.kernel.org
Cc: Greg KH <greg@...ah.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
David Plowman <david.plowman@...pberrypi.com>,
Hans Verkuil <hverkuil-cisco@...all.nl>,
Jacopo Mondi <jacopo.mondi@...asonboard.com>,
Naushir Patuck <naush@...pberrypi.com>,
Nick Hollinghurst <nick.hollinghurst@...pberrypi.org>,
Sakari Ailus <sakari.ailus@...ux.intel.com>,
Uwe Kleine-König <u.kleine-koenig@...gutronix.de>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: [PATCH 1/1] media: raspberrypi: Switch to remove_new
From: Stephen Rothwell <sfr@...b.auug.org.au>
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")
Co-developed-by: Stephen Rothwell <sfr@...b.auug.org.au>
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
Acked-by: Naushir Patuck <naush@...pberrypi.com>
Acked-by: Jacopo Mondi <jacopo.mondi@...asonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@...ux.intel.com>
---
Hi folks,
This patch improves the original 'linux-next: build failure after merge of
the driver-core tree' patch. I kept the acks, hopefully that's fine.
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 6 ++----
1 file 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 @@ 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,
--
2.39.2
Powered by blists - more mailing lists