[PATCH] zorro: Have zorro_bus_match() callback take a const *

[PATCH] zorro: Have zorro_bus_match() callback take a const *

[Geert Uytterhoeven]

drivers/zorro/zorro-driver.c:157:12: error: initialization of ‘int (*)(struct device *, const struct device_driver *)’ from incompatible pointer type ‘int (*)(struct device *, struct device_driver *)’ [-Werror=incompatible-pointer-types]
  157 |  .match  = zorro_bus_match,
      |            ^~~~~~~~~~~~~~~
drivers/zorro/zorro-driver.c:157:12: note: (near initialization for ‘zorro_bus_type.match’)

Reported-by: noreply@ellerman.id.au
Fixes: d69d804845985c29 ("driver core: have match() callback in struct bus_type take a const *")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 drivers/zorro/zorro-driver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c
index f49d19977e82a718..e7d3af1a223f9abf 100644
--- a/drivers/zorro/zorro-driver.c
+++ b/drivers/zorro/zorro-driver.c
@@ -118,10 +118,10 @@ EXPORT_SYMBOL(zorro_unregister_driver);
      *  supported, and 0 if there is no match.
      */
 
-static int zorro_bus_match(struct device *dev, struct device_driver *drv)
+static int zorro_bus_match(struct device *dev, const struct device_driver *drv)
 {
 	struct zorro_dev *z = to_zorro_dev(dev);
-	struct zorro_driver *zorro_drv = to_zorro_driver(drv);
+	const struct zorro_driver *zorro_drv = to_zorro_driver(drv);
 	const struct zorro_device_id *ids = zorro_drv->id_table;
 
 	if (!ids)
-- 
2.34.1

Re: [PATCH] zorro: Have zorro_bus_match() callback take a const *

[Greg Kroah-Hartman]

On Wed, Jul 10, 2024 at 09:45:00AM +0200, Geert Uytterhoeven wrote:
> drivers/zorro/zorro-driver.c:157:12: error: initialization of ‘int (*)(struct device *, const struct device_driver *)’ from incompatible pointer type ‘int (*)(struct device *, struct device_driver *)’ [-Werror=incompatible-pointer-types]
>   157 |  .match  = zorro_bus_match,
>       |            ^~~~~~~~~~~~~~~
> drivers/zorro/zorro-driver.c:157:12: note: (near initialization for ‘zorro_bus_type.match’)
> 
> Reported-by: noreply@ellerman.id.au
> Fixes: d69d804845985c29 ("driver core: have match() callback in struct bus_type take a const *")
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
>  drivers/zorro/zorro-driver.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c
> index f49d19977e82a718..e7d3af1a223f9abf 100644
> --- a/drivers/zorro/zorro-driver.c
> +++ b/drivers/zorro/zorro-driver.c
> @@ -118,10 +118,10 @@ EXPORT_SYMBOL(zorro_unregister_driver);
>       *  supported, and 0 if there is no match.
>       */
>  
> -static int zorro_bus_match(struct device *dev, struct device_driver *drv)
> +static int zorro_bus_match(struct device *dev, const struct device_driver *drv)
>  {
>  	struct zorro_dev *z = to_zorro_dev(dev);
> -	struct zorro_driver *zorro_drv = to_zorro_driver(drv);
> +	const struct zorro_driver *zorro_drv = to_zorro_driver(drv);

Patches crossed in the mail :)

Look at mine, I also fixed up to_zorro_driver() to properly pass through
the const pointer which would be good here.

thanks,

greg k-h