From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: "Greg KH" <greg@kroah.com>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>,
"David Plowman" <david.plowman@raspberrypi.com>,
"Hans Verkuil" <hverkuil-cisco@xs4all.nl>,
"Jacopo Mondi" <jacopo.mondi@ideasonboard.com>,
"Naushir Patuck" <naush@raspberrypi.com>,
"Nick Hollinghurst" <nick.hollinghurst@raspberrypi.org>,
"Sakari Ailus" <sakari.ailus@linux.intel.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>
Subject: [PATCH 1/1] media: raspberrypi: Switch to remove_new
Date: Tue, 9 Jul 2024 19:17:35 +0300 [thread overview]
Message-ID: <20240709161735.3724913-1-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20240709163715.3bcd6ab3@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.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@canb.auug.org.au>
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>
---
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
next prev parent reply other threads:[~2024-07-09 16:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 6:37 linux-next: build failure after merge of the driver-core tree Stephen Rothwell
2024-07-09 6:52 ` Uwe Kleine-König
2024-07-09 7:14 ` Jacopo Mondi
2024-07-09 7:40 ` Naushir Patuck
2024-07-09 15:09 ` Sakari Ailus
2024-07-09 15:26 ` Sakari Ailus
2024-10-01 11:18 ` Mauro Carvalho Chehab
2024-10-01 11:20 ` Mauro Carvalho Chehab
2024-07-09 16:17 ` Sakari Ailus [this message]
2024-07-09 16:35 ` [PATCH 1/1] media: raspberrypi: Switch to remove_new Uwe Kleine-König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240709161735.3724913-1-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=david.plowman@raspberrypi.com \
--cc=greg@kroah.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jacopo.mondi@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=naush@raspberrypi.com \
--cc=nick.hollinghurst@raspberrypi.org \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).