[v1] linux-next: build failure after merge of the driver-core tree

linux-next: build failure after merge of the driver-core tree

Posted by Stephen Rothwell 1 year, 5 months ago

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

Re: linux-next: build failure after merge of the driver-core tree

Posted by Sakari Ailus 1 year, 5 months ago

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

Re: linux-next: build failure after merge of the driver-core tree

Posted by Sakari Ailus 1 year, 5 months ago

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

Re: linux-next: build failure after merge of the driver-core tree

Posted by Mauro Carvalho Chehab 1 year, 2 months ago

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

Re: linux-next: build failure after merge of the driver-core tree

Posted by Mauro Carvalho Chehab 1 year, 2 months ago

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

Re: linux-next: build failure after merge of the driver-core tree

Posted by Naushir Patuck 1 year, 5 months ago

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

Re: linux-next: build failure after merge of the driver-core tree

Posted by Jacopo Mondi 1 year, 5 months ago

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

Re: linux-next: build failure after merge of the driver-core tree

Posted by Uwe Kleine-König 1 year, 5 months ago

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

[PATCH 1/1] media: raspberrypi: Switch to remove_new

Posted by Sakari Ailus 1 year, 5 months ago

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

Re: [PATCH 1/1] media: raspberrypi: Switch to remove_new

Posted by Uwe Kleine-König 1 year, 5 months ago

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