[PATCH] staging: greybus: gbphy: fix up const issue with the match callback

[PATCH] staging: greybus: gbphy: fix up const issue with the match callback

[Greg Kroah-Hartman]

gbphy_dev_match_id() should be taking a const pointer, as the pointer
passed to it from the container_of() call was const to start with (it
was accidentally cast away with the call.)  Fix this all up by correctly
marking the pointer types.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/staging/greybus/gbphy.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/greybus/gbphy.c b/drivers/staging/greybus/gbphy.c
index 6adcad286633..ab8a1af36808 100644
--- a/drivers/staging/greybus/gbphy.c
+++ b/drivers/staging/greybus/gbphy.c
@@ -102,8 +102,8 @@ static int gbphy_dev_uevent(const struct device *dev, struct kobj_uevent_env *en
 }
 
 static const struct gbphy_device_id *
-gbphy_dev_match_id(struct gbphy_device *gbphy_dev,
-		   struct gbphy_driver *gbphy_drv)
+gbphy_dev_match_id(const struct gbphy_device *gbphy_dev,
+		   const struct gbphy_driver *gbphy_drv)
 {
 	const struct gbphy_device_id *id = gbphy_drv->id_table;
 
@@ -119,8 +119,8 @@ gbphy_dev_match_id(struct gbphy_device *gbphy_dev,
 
 static int gbphy_dev_match(struct device *dev, const struct device_driver *drv)
 {
-	struct gbphy_driver *gbphy_drv = to_gbphy_driver(drv);
-	struct gbphy_device *gbphy_dev = to_gbphy_dev(dev);
+	const struct gbphy_driver *gbphy_drv = to_gbphy_driver(drv);
+	const struct gbphy_device *gbphy_dev = to_gbphy_dev(dev);
 	const struct gbphy_device_id *id;
 
 	id = gbphy_dev_match_id(gbphy_dev, gbphy_drv);
-- 
2.49.0

Re: [PATCH] staging: greybus: gbphy: fix up const issue with the match callback

[Johan Hovold]

On Wed, May 21, 2025 at 04:55:55PM +0200, Greg Kroah-Hartman wrote:
> gbphy_dev_match_id() should be taking a const pointer, as the pointer
> passed to it from the container_of() call was const to start with (it
> was accidentally cast away with the call.)  Fix this all up by correctly
> marking the pointer types.

This one too should have a:

Fixes: d69d80484598 ("driver core: have match() callback in struct bus_type take a const *")

> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>  drivers/staging/greybus/gbphy.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/greybus/gbphy.c b/drivers/staging/greybus/gbphy.c
> index 6adcad286633..ab8a1af36808 100644
> --- a/drivers/staging/greybus/gbphy.c
> +++ b/drivers/staging/greybus/gbphy.c
> @@ -102,8 +102,8 @@ static int gbphy_dev_uevent(const struct device *dev, struct kobj_uevent_env *en
>  }
>  
>  static const struct gbphy_device_id *
> -gbphy_dev_match_id(struct gbphy_device *gbphy_dev,
> -		   struct gbphy_driver *gbphy_drv)
> +gbphy_dev_match_id(const struct gbphy_device *gbphy_dev,
> +		   const struct gbphy_driver *gbphy_drv)
>  {
>  	const struct gbphy_device_id *id = gbphy_drv->id_table;
>  
> @@ -119,8 +119,8 @@ gbphy_dev_match_id(struct gbphy_device *gbphy_dev,
>  
>  static int gbphy_dev_match(struct device *dev, const struct device_driver *drv)
>  {
> -	struct gbphy_driver *gbphy_drv = to_gbphy_driver(drv);
> -	struct gbphy_device *gbphy_dev = to_gbphy_dev(dev);
> +	const struct gbphy_driver *gbphy_drv = to_gbphy_driver(drv);
> +	const struct gbphy_device *gbphy_dev = to_gbphy_dev(dev);

Making the dev pointers const is arguably a separate change, but I guess
it's related enough:

Reviewed-by: Johan Hovold <johan@kernel.org>

Johan

Re: [PATCH] staging: greybus: gbphy: fix up const issue with the match callback

[Greg Kroah-Hartman]

On Thu, May 22, 2025 at 02:55:58PM +0200, Johan Hovold wrote:
> On Wed, May 21, 2025 at 04:55:55PM +0200, Greg Kroah-Hartman wrote:
> > gbphy_dev_match_id() should be taking a const pointer, as the pointer
> > passed to it from the container_of() call was const to start with (it
> > was accidentally cast away with the call.)  Fix this all up by correctly
> > marking the pointer types.
> 
> This one too should have a:
> 
> Fixes: d69d80484598 ("driver core: have match() callback in struct bus_type take a const *")
> 
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > ---
> >  drivers/staging/greybus/gbphy.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/staging/greybus/gbphy.c b/drivers/staging/greybus/gbphy.c
> > index 6adcad286633..ab8a1af36808 100644
> > --- a/drivers/staging/greybus/gbphy.c
> > +++ b/drivers/staging/greybus/gbphy.c
> > @@ -102,8 +102,8 @@ static int gbphy_dev_uevent(const struct device *dev, struct kobj_uevent_env *en
> >  }
> >  
> >  static const struct gbphy_device_id *
> > -gbphy_dev_match_id(struct gbphy_device *gbphy_dev,
> > -		   struct gbphy_driver *gbphy_drv)
> > +gbphy_dev_match_id(const struct gbphy_device *gbphy_dev,
> > +		   const struct gbphy_driver *gbphy_drv)
> >  {
> >  	const struct gbphy_device_id *id = gbphy_drv->id_table;
> >  
> > @@ -119,8 +119,8 @@ gbphy_dev_match_id(struct gbphy_device *gbphy_dev,
> >  
> >  static int gbphy_dev_match(struct device *dev, const struct device_driver *drv)
> >  {
> > -	struct gbphy_driver *gbphy_drv = to_gbphy_driver(drv);
> > -	struct gbphy_device *gbphy_dev = to_gbphy_dev(dev);
> > +	const struct gbphy_driver *gbphy_drv = to_gbphy_driver(drv);
> > +	const struct gbphy_device *gbphy_dev = to_gbphy_dev(dev);
> 
> Making the dev pointers const is arguably a separate change, but I guess
> it's related enough:

Oops, nope, you are right, the dev pointer should not be const here, or
anywhere else, that's not needed, I got too energetic.  I'll respin this
and add the fixes: tag, thanks!

greg k-h