linux-next: build failure after merge of the driver-core tree
Subsystems (4)
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 <[email protected]>
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.
--- drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +1 -3
@@ -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 = {
Signature · 5 lines
2.43.0 -- Cheers, Stephen Rothwell
Quoted 52 lines · Stephen Rothwell
Hi all,
After merging the driver-core tree, today's linux-next build (
x86_64allmodconfig) failed like this:
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(structplatform_device*)' from incompatible pointer type 'int (*)(structplatform_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 errorsCaused by commit
0edb555a65d1("platform: Makeplatform_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 <[email protected]>
Date: Tue, 9 Jul 2024 16:03:05 +1000
Subject: [PATCH] fix up for "platform: Makeplatform_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 <[email protected]>--- drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +1
-1@@ -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);
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c static int pispbe_remove(struct platform_device *pdev) · line 1770
Quoted 8 lines
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +0
-2@@ -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
Hi Stephen
Quoted 27 lines · Stephen Rothwell
Hi all,
After merging the driver-core tree, today's linux-next build (
x86_64allmodconfig) failed like this:
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(structplatform_device*)' from incompatible pointer type 'int (*)(structplatform_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 errorsCaused by commit
0edb555a65d1("platform: Makeplatform_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 <[email protected]>
Date: Tue, 9 Jul 2024 16:03:05 +1000
Subject: [PATCH] fix up for "platform: Makeplatform_driver::remove()return void"
Quoted 7 lines
interacting with commit
12187bd5d4f8("media: raspberrypi: Add support for PiSP BE")from the v4l-dvb-next tree.
Signed-off-by Stephen Rothwell <[email protected]>
Thanks, I haven't noticed it as I've based my work on the linux media staging branch which doesn't include 0edb555a65d1.
Thanks
j
Quoted 32 lines
--- drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +1
-4@@ -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
Naushir Patuck
Acked-byHI Stephen,
Thank you for fixing this.
Quoted 28 lines · Stephen Rothwell
Hi all,
After merging the driver-core tree, today's linux-next build (
x86_64allmodconfig) failed like this:
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(structplatform_device*)' from incompatible pointer type 'int (*)(structplatform_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 errorsCaused by commit
0edb555a65d1("platform: Makeplatform_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 <[email protected]>
Date: Tue, 9 Jul 2024 16:03:05 +1000
Subject: [PATCH] fix up for "platform: Makeplatform_driver::remove()return void"
Quoted 7 lines
interacting with commit
12187bd5d4f8("media: raspberrypi: Add support for PiSP BE")from the v4l-dvb-next tree.
Signed-off-by Stephen Rothwell <[email protected]>
Quoted 32 lines
--- drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +1
-4@@ -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
Hi Stephen,
Thanks for the patch.
Quoted 43 lines · Stephen Rothwell
Hi all,
After merging the driver-core tree, today's linux-next build (
x86_64allmodconfig) failed like this:
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(structplatform_device*)' from incompatible pointer type 'int (*)(structplatform_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 errorsCaused by commit
0edb555a65d1("platform: Makeplatform_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 <[email protected]>
Date: Tue, 9 Jul 2024 16:03:05 +1000
Subject: [PATCH] fix up for "platform: Makeplatform_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 <[email protected]>--- drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +0
-0
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c static int pispbe_probe(struct platform_device *pdev) · line 1759
Quoted 5 lines
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +1
-1@@ -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.
Quoted 12 lines
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +0
-2{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 = {
Signature · 3 lines
Kind regards, Sakari Ailus
Quoted 51 lines · Sakari Ailus
Hi Stephen,
Thanks for the patch.
Quoted 46 lines · Stephen Rothwell
Hi all,
After merging the driver-core tree, today's linux-next build (
x86_64allmodconfig) failed like this:
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(structplatform_device*)' from incompatible pointer type 'int (*)(structplatform_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 errorsCaused by commit
0edb555a65d1("platform: Makeplatform_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 <[email protected]>
Date: Tue, 9 Jul 2024 16:03:05 +1000
Subject: [PATCH] fix up for "platform: Makeplatform_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 <[email protected]>--- drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +0
-0@@ -1756,7 +1756,7 @@ static int pispbe_probe(struct platform_device *pdev)return ret; }
Quoted 8 lines
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c static int pispbe_probe(struct platform_device *pdev) · line 1759
Quoted 2 lines
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +1
-1-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 theremove_newop as its return type won't be changed. That can be merged independently of commit0edb555a65d1.Feel free to submit v2, I can post a modified patch as well.
IOW, I'll add this and post v2:
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +1 -1
@@ -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,
Signature · 1 line
Sakari Ailus
Em Tue, 9 Jul 2024 15:26:36 +0000
Sakari Ailus <[email protected]> escreveu:
Quoted 69 lines · Sakari Ailus
Quoted 51 lines
Hi Stephen,
Thanks for the patch.
Quoted 46 lines · Stephen Rothwell
Hi all,
After merging the driver-core tree, today's linux-next build (
x86_64allmodconfig) failed like this:
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(structplatform_device*)' from incompatible pointer type 'int (*)(structplatform_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 errorsCaused by commit
0edb555a65d1("platform: Makeplatform_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 <[email protected]>
Date: Tue, 9 Jul 2024 16:03:05 +1000
Subject: [PATCH] fix up for "platform: Makeplatform_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 <[email protected]>--- drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +0
-0@@ -1756,7 +1756,7 @@ static int pispbe_probe(struct platform_device *pdev)return ret; }Quoted 8 lines
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c static int pispbe_probe(struct platform_device *pdev) · line 1759
Quoted 2 lines
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +1
-1-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 theremove_newop as its return type won't be changed. That can be merged independently of commit0edb555a65d1.Feel free to submit v2, I can post a modified patch as well.
IOW, I'll add this and post v2:
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +0
-0
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c MODULE_DEVICE_TABLE(of, pispbe_of_match); · line 1787
Quoted 8 lines
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +1
-1@@ -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
Em Tue, 1 Oct 2024 13:18:00 +0200
Mauro Carvalho Chehab <[email protected]> escreveu:
Quoted 2 lines
Em Tue, 9 Jul 2024 15:26:36 +0000
Sakari Ailus <[email protected]> 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
Quoted 82 lines
Quoted 70 lines · Sakari Ailus
Quoted 51 lines
Hi Stephen,
Thanks for the patch.
Quoted 46 lines · Stephen Rothwell
Hi all,
After merging the driver-core tree, today's linux-next build (
x86_64allmodconfig) failed like this:
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(structplatform_device*)' from incompatible pointer type 'int (*)(structplatform_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 errorsCaused by commit
0edb555a65d1("platform: Makeplatform_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 <[email protected]>
Date: Tue, 9 Jul 2024 16:03:05 +1000
Subject: [PATCH] fix up for "platform: Makeplatform_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 <[email protected]>--- drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +0
-0@@ -1756,7 +1756,7 @@ static int pispbe_probe(struct platform_device *pdev)return ret; }Quoted 8 lines
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c static int pispbe_probe(struct platform_device *pdev) · line 1759
Quoted 2 lines
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +1
-1-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 theremove_newop as its return type won't be changed. That can be merged independently of commit0edb555a65d1.Feel free to submit v2, I can post a modified patch as well.
IOW, I'll add this and post v2:
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +0
-0drivers/media/platform/raspberrypi/pisp_be/pisp_be.c MODULE_DEVICE_TABLE(of, pispbe_of_match); · line 1787
Quoted 8 lines
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +1
-1@@ -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.
Quoted 6 lines
We can later migrate this one from
remove_newto remove for 6.13, as the return argument forpispbe_removeis bogus.Thanks,
Mauro
Thanks,
Mauro
PATCH 1/1 media: raspberrypi: Switch to remove_new
In reply to Stephen RothwellFrom: Stephen Rothwell <[email protected]>
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.
---
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(-)
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +2 -4
@@ -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,
Signature · 1 line
2.39.2
Re: [PATCH 1/1] media: raspberrypi: Switch to remove_new
Hello,
Quoted 7 lines · Sakari Ailus
From: Stephen Rothwell <[email protected]>
The remove callback's return value is about to change from int to void, this is done by commit
0edb555a65d1("platform: Makeplatform_driver::remove()return void"). Prepare for merging the patch by switching the PiSP driver from remove toremove_newcallback.
Quoted 6 lines
Fixes 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")Co-developed-by Stephen Rothwell <[email protected]>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]>
Thanks and best regards
Uwe