* linux-next: build failure after merge of the driver-core tree
@ 2024-07-09 6:37 Stephen Rothwell
2024-07-09 6:52 ` Uwe Kleine-König
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Stephen Rothwell @ 2024-07-09 6:37 UTC (permalink / raw)
To: Greg KH, Mauro Carvalho Chehab
Cc: David Plowman, Hans Verkuil, Jacopo Mondi, Naushir Patuck,
Nick Hollinghurst, Sakari Ailus, Uwe Kleine-König,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2241 bytes --]
Hi all,
After merging the driver-core tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
1786 | .remove = pispbe_remove,
| ^~~~~~~~~~~~~
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: note: (near initialization for 'pispbe_pdrv.<anonymous>.remove')
cc1: all warnings being treated as errors
Caused by commit
0edb555a65d1 ("platform: Make platform_driver::remove() return void")
interacting withc commit
12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
from the vl4-dvb-next tree.
I have applied the following fix up patch.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 9 Jul 2024 16:03:05 +1000
Subject: [PATCH] fix up for "platform: Make platform_driver::remove() return void"
interacting with commit
12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
from the v4l-dvb-next tree.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +---
1 file changed, 1 insertion(+), 3 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..7596ae1f7de6 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 = {
--
2.43.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the driver-core tree
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
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Uwe Kleine-König @ 2024-07-09 6:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, Mauro Carvalho Chehab, David Plowman, Hans Verkuil,
Jacopo Mondi, Naushir Patuck, Nick Hollinghurst, Sakari Ailus,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2425 bytes --]
On Tue, Jul 09, 2024 at 04:37:15PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the driver-core tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
> 1786 | .remove = pispbe_remove,
> | ^~~~~~~~~~~~~
> drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: note: (near initialization for 'pispbe_pdrv.<anonymous>.remove')
> cc1: all warnings being treated as errors
>
> Caused by commit
>
> 0edb555a65d1 ("platform: Make platform_driver::remove() return void")
>
> interacting withc commit
>
> 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
>
> from the vl4-dvb-next tree.
>
> I have applied the following fix up patch.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Tue, 9 Jul 2024 16:03:05 +1000
> Subject: [PATCH] fix up for "platform: Make platform_driver::remove() return void"
>
> interacting with commit
>
> 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
>
> from the v4l-dvb-next tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +---
> 1 file changed, 1 insertion(+), 3 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..7596ae1f7de6 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 = {
Looks good, thanks.
Best regards
Uwe
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the driver-core tree
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
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Jacopo Mondi @ 2024-07-09 7:14 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, Mauro Carvalho Chehab, David Plowman, Hans Verkuil,
Jacopo Mondi, Naushir Patuck, Nick Hollinghurst, Sakari Ailus,
Uwe Kleine-König, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2553 bytes --]
Hi Stephen
On Tue, Jul 09, 2024 at 04:37:15PM GMT, Stephen Rothwell wrote:
> Hi all,
>
> After merging the driver-core tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
> 1786 | .remove = pispbe_remove,
> | ^~~~~~~~~~~~~
> drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: note: (near initialization for 'pispbe_pdrv.<anonymous>.remove')
> cc1: all warnings being treated as errors
>
> Caused by commit
>
> 0edb555a65d1 ("platform: Make platform_driver::remove() return void")
>
> interacting withc commit
>
> 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
>
> from the vl4-dvb-next tree.
>
> I have applied the following fix up patch.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Tue, 9 Jul 2024 16:03:05 +1000
> Subject: [PATCH] fix up for "platform: Make platform_driver::remove() return void"
>
> interacting with commit
>
> 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
>
> from the v4l-dvb-next tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
Thanks, I haven't noticed it as I've based my work on the linux media
staging branch which doesn't include 0edb555a65d1.
Acked-by: Jacopo Mondi <jacopo.mondi@ideasonboard•com>
Thanks
j
> ---
> drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +---
> 1 file changed, 1 insertion(+), 3 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..7596ae1f7de6 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 = {
> --
> 2.43.0
>
> --
> Cheers,
> Stephen Rothwell
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the driver-core tree
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 16:17 ` [PATCH 1/1] media: raspberrypi: Switch to remove_new Sakari Ailus
4 siblings, 0 replies; 10+ messages in thread
From: Naushir Patuck @ 2024-07-09 7:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, Mauro Carvalho Chehab, David Plowman, Hans Verkuil,
Jacopo Mondi, Nick Hollinghurst, Sakari Ailus,
Uwe Kleine-König, Linux Kernel Mailing List,
Linux Next Mailing List
HI Stephen,
Thank you for fixing this.
On Tue, 9 Jul 2024 at 07:37, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Hi all,
>
> After merging the driver-core tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
> 1786 | .remove = pispbe_remove,
> | ^~~~~~~~~~~~~
> drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: note: (near initialization for 'pispbe_pdrv.<anonymous>.remove')
> cc1: all warnings being treated as errors
>
> Caused by commit
>
> 0edb555a65d1 ("platform: Make platform_driver::remove() return void")
>
> interacting withc commit
>
> 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
>
> from the vl4-dvb-next tree.
>
> I have applied the following fix up patch.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Tue, 9 Jul 2024 16:03:05 +1000
> Subject: [PATCH] fix up for "platform: Make platform_driver::remove() return void"
>
> interacting with commit
>
> 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
>
> from the v4l-dvb-next tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
Acked-by: Naushir Patuck <naush@raspberrypi•com>
> ---
> drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +---
> 1 file changed, 1 insertion(+), 3 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..7596ae1f7de6 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 = {
> --
> 2.43.0
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the driver-core tree
2024-07-09 6:37 linux-next: build failure after merge of the driver-core tree Stephen Rothwell
` (2 preceding siblings ...)
2024-07-09 7:40 ` Naushir Patuck
@ 2024-07-09 15:09 ` Sakari Ailus
2024-07-09 15:26 ` Sakari Ailus
2024-07-09 16:17 ` [PATCH 1/1] media: raspberrypi: Switch to remove_new Sakari Ailus
4 siblings, 1 reply; 10+ messages in thread
From: Sakari Ailus @ 2024-07-09 15:09 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, Mauro Carvalho Chehab, David Plowman, Hans Verkuil,
Jacopo Mondi, Naushir Patuck, Nick Hollinghurst,
Uwe Kleine-König, Linux Kernel Mailing List,
Linux Next Mailing List
Hi Stephen,
Thanks for the patch.
On Tue, Jul 09, 2024 at 04:37:15PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the driver-core tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
> 1786 | .remove = pispbe_remove,
> | ^~~~~~~~~~~~~
> drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: note: (near initialization for 'pispbe_pdrv.<anonymous>.remove')
> cc1: all warnings being treated as errors
>
> Caused by commit
>
> 0edb555a65d1 ("platform: Make platform_driver::remove() return void")
>
> interacting withc commit
>
> 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
>
> from the vl4-dvb-next tree.
>
> I have applied the following fix up patch.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Tue, 9 Jul 2024 16:03:05 +1000
> Subject: [PATCH] fix up for "platform: Make platform_driver::remove() return void"
>
> interacting with commit
>
> 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
>
> from the v4l-dvb-next tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +---
> 1 file changed, 1 insertion(+), 3 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..7596ae1f7de6 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)
While this approach works when the patch is squashed to commit
0edb555a65d1, it's better to also use the remove_new op as its return type
won't be changed. That can be merged independently of commit 0edb555a65d1.
Feel free to submit v2, I can post a modified patch as well.
Thanks.
> {
> 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 = {
--
Kind regards,
Sakari Ailus
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the driver-core tree
2024-07-09 15:09 ` Sakari Ailus
@ 2024-07-09 15:26 ` Sakari Ailus
2024-10-01 11:18 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 10+ messages in thread
From: Sakari Ailus @ 2024-07-09 15:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, Mauro Carvalho Chehab, David Plowman, Hans Verkuil,
Jacopo Mondi, Naushir Patuck, Nick Hollinghurst,
Uwe Kleine-König, Linux Kernel Mailing List,
Linux Next Mailing List
On Tue, Jul 09, 2024 at 03:09:34PM +0000, Sakari Ailus wrote:
> Hi Stephen,
>
> Thanks for the patch.
>
> On Tue, Jul 09, 2024 at 04:37:15PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the driver-core tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
> > 1786 | .remove = pispbe_remove,
> > | ^~~~~~~~~~~~~
> > drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: note: (near initialization for 'pispbe_pdrv.<anonymous>.remove')
> > cc1: all warnings being treated as errors
> >
> > Caused by commit
> >
> > 0edb555a65d1 ("platform: Make platform_driver::remove() return void")
> >
> > interacting withc commit
> >
> > 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
> >
> > from the vl4-dvb-next tree.
> >
> > I have applied the following fix up patch.
> >
> > From: Stephen Rothwell <sfr@canb•auug.org.au>
> > Date: Tue, 9 Jul 2024 16:03:05 +1000
> > Subject: [PATCH] fix up for "platform: Make platform_driver::remove() return void"
> >
> > interacting with commit
> >
> > 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
> >
> > from the v4l-dvb-next tree.
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> > ---
> > drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 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..7596ae1f7de6 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)
>
> While this approach works when the patch is squashed to commit
> 0edb555a65d1, it's better to also use the remove_new op as its return type
> won't be changed. That can be merged independently of commit 0edb555a65d1.
>
> Feel free to submit v2, I can post a modified patch as well.
IOW, I'll add this and post v2:
diff --git a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
index 7596ae1f7de6..65ff2382cffe 100644
--- a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
+++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
@@ -1781,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,
--
Sakari Ailus
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 1/1] media: raspberrypi: Switch to remove_new
2024-07-09 6:37 linux-next: build failure after merge of the driver-core tree Stephen Rothwell
` (3 preceding siblings ...)
2024-07-09 15:09 ` Sakari Ailus
@ 2024-07-09 16:17 ` Sakari Ailus
2024-07-09 16:35 ` Uwe Kleine-König
4 siblings, 1 reply; 10+ messages in thread
From: Sakari Ailus @ 2024-07-09 16:17 UTC (permalink / raw)
To: linux-media
Cc: Greg KH, Mauro Carvalho Chehab, David Plowman, Hans Verkuil,
Jacopo Mondi, Naushir Patuck, Nick Hollinghurst, Sakari Ailus,
Uwe Kleine-König, Linux Kernel Mailing List,
Linux Next Mailing List
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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] media: raspberrypi: Switch to remove_new
2024-07-09 16:17 ` [PATCH 1/1] media: raspberrypi: Switch to remove_new Sakari Ailus
@ 2024-07-09 16:35 ` Uwe Kleine-König
0 siblings, 0 replies; 10+ messages in thread
From: Uwe Kleine-König @ 2024-07-09 16:35 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, Greg KH, Mauro Carvalho Chehab, David Plowman,
Hans Verkuil, Jacopo Mondi, Naushir Patuck, Nick Hollinghurst,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 860 bytes --]
Hello,
On Tue, Jul 09, 2024 at 07:17:35PM +0300, Sakari Ailus wrote:
> 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>
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@baylibre•com>
Thanks and best regards
Uwe
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the driver-core tree
2024-07-09 15:26 ` Sakari Ailus
@ 2024-10-01 11:18 ` Mauro Carvalho Chehab
2024-10-01 11:20 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 10+ messages in thread
From: Mauro Carvalho Chehab @ 2024-10-01 11:18 UTC (permalink / raw)
To: Sakari Ailus
Cc: Stephen Rothwell, Greg KH, Mauro Carvalho Chehab, David Plowman,
Hans Verkuil, Jacopo Mondi, Naushir Patuck, Nick Hollinghurst,
Uwe Kleine-König, Linux Kernel Mailing List,
Linux Next Mailing List
Em Tue, 9 Jul 2024 15:26:36 +0000
Sakari Ailus <sakari.ailus@linux•intel.com> escreveu:
> On Tue, Jul 09, 2024 at 03:09:34PM +0000, Sakari Ailus wrote:
> > Hi Stephen,
> >
> > Thanks for the patch.
> >
> > On Tue, Jul 09, 2024 at 04:37:15PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > After merging the driver-core tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
> > > 1786 | .remove = pispbe_remove,
> > > | ^~~~~~~~~~~~~
> > > drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: note: (near initialization for 'pispbe_pdrv.<anonymous>.remove')
> > > cc1: all warnings being treated as errors
> > >
> > > Caused by commit
> > >
> > > 0edb555a65d1 ("platform: Make platform_driver::remove() return void")
> > >
> > > interacting withc commit
> > >
> > > 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
> > >
> > > from the vl4-dvb-next tree.
> > >
> > > I have applied the following fix up patch.
> > >
> > > From: Stephen Rothwell <sfr@canb•auug.org.au>
> > > Date: Tue, 9 Jul 2024 16:03:05 +1000
> > > Subject: [PATCH] fix up for "platform: Make platform_driver::remove() return void"
> > >
> > > interacting with commit
> > >
> > > 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
> > >
> > > from the v4l-dvb-next tree.
> > >
> > > Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> > > ---
> > > drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +---
> > > 1 file changed, 1 insertion(+), 3 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..7596ae1f7de6 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)
> >
> > While this approach works when the patch is squashed to commit
> > 0edb555a65d1, it's better to also use the remove_new op as its return type
> > won't be changed. That can be merged independently of commit 0edb555a65d1.
> >
> > Feel free to submit v2, I can post a modified patch as well.
>
> IOW, I'll add this and post v2:
>
> diff --git a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
> index 7596ae1f7de6..65ff2382cffe 100644
> --- a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
> +++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
> @@ -1781,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,
>
Makes sense to me, as it prevents having a patch floating around at
-next to solve the conflict.
We can later migrate this one from remove_new to remove for
6.13, as the return argument for pispbe_remove is bogus.
Thanks,
Mauro
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the driver-core tree
2024-10-01 11:18 ` Mauro Carvalho Chehab
@ 2024-10-01 11:20 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 10+ messages in thread
From: Mauro Carvalho Chehab @ 2024-10-01 11:20 UTC (permalink / raw)
To: Sakari Ailus
Cc: Stephen Rothwell, Greg KH, Mauro Carvalho Chehab, David Plowman,
Hans Verkuil, Jacopo Mondi, Naushir Patuck, Nick Hollinghurst,
Uwe Kleine-König, Linux Kernel Mailing List,
Linux Next Mailing List
Em Tue, 1 Oct 2024 13:18:00 +0200
Mauro Carvalho Chehab <mchehab+huawei@kernel•org> escreveu:
> Em Tue, 9 Jul 2024 15:26:36 +0000
> Sakari Ailus <sakari.ailus@linux•intel.com> escreveu:
Please ignore my comment below. I didn't realize I had a filter on my mailbox.
This was solved already a long time ago...
Regards,
Mauro
>
> > On Tue, Jul 09, 2024 at 03:09:34PM +0000, Sakari Ailus wrote:
> > > Hi Stephen,
> > >
> > > Thanks for the patch.
> > >
> > > On Tue, Jul 09, 2024 at 04:37:15PM +1000, Stephen Rothwell wrote:
> > > > Hi all,
> > > >
> > > > After merging the driver-core tree, today's linux-next build (x86_64
> > > > allmodconfig) failed like this:
> > > >
> > > > drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
> > > > 1786 | .remove = pispbe_remove,
> > > > | ^~~~~~~~~~~~~
> > > > drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: note: (near initialization for 'pispbe_pdrv.<anonymous>.remove')
> > > > cc1: all warnings being treated as errors
> > > >
> > > > Caused by commit
> > > >
> > > > 0edb555a65d1 ("platform: Make platform_driver::remove() return void")
> > > >
> > > > interacting withc commit
> > > >
> > > > 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
> > > >
> > > > from the vl4-dvb-next tree.
> > > >
> > > > I have applied the following fix up patch.
> > > >
> > > > From: Stephen Rothwell <sfr@canb•auug.org.au>
> > > > Date: Tue, 9 Jul 2024 16:03:05 +1000
> > > > Subject: [PATCH] fix up for "platform: Make platform_driver::remove() return void"
> > > >
> > > > interacting with commit
> > > >
> > > > 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")
> > > >
> > > > from the v4l-dvb-next tree.
> > > >
> > > > Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> > > > ---
> > > > drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +---
> > > > 1 file changed, 1 insertion(+), 3 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..7596ae1f7de6 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)
> > >
> > > While this approach works when the patch is squashed to commit
> > > 0edb555a65d1, it's better to also use the remove_new op as its return type
> > > won't be changed. That can be merged independently of commit 0edb555a65d1.
> > >
> > > Feel free to submit v2, I can post a modified patch as well.
> >
> > IOW, I'll add this and post v2:
> >
> > diff --git a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
> > index 7596ae1f7de6..65ff2382cffe 100644
> > --- a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
> > +++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
> > @@ -1781,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,
> >
>
> Makes sense to me, as it prevents having a patch floating around at
> -next to solve the conflict.
>
> We can later migrate this one from remove_new to remove for
> 6.13, as the return argument for pispbe_remove is bogus.
>
>
> Thanks,
> Mauro
Thanks,
Mauro
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-10-01 11:20 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [PATCH 1/1] media: raspberrypi: Switch to remove_new Sakari Ailus
2024-07-09 16:35 ` Uwe Kleine-König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox