[PATCH] zorro: make match function take a const pointer

[PATCH] zorro: make match function take a const pointer

[Greg Kroah-Hartman]

In commit d69d80484598 ("driver core: have match() callback in struct bus_type
take a const *"), the match callback for busses was changed to take a const
pointer to struct device_driver.  Unfortunatly I missed fixing up the zorro
code, and was only noticed after-the-fact by the kernel test robot.  Resolve
this issue by properly changing the zorro_bus_match() function.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Fixes: d69d80484598 ("driver core: have match() callback in struct bus_type take a const *")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/zorro/zorro-driver.c | 4 ++--
 include/linux/zorro.h        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c
index f49d19977e82..e7d3af1a223f 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)
diff --git a/include/linux/zorro.h b/include/linux/zorro.h
index db7416ed6057..f36c8d39553d 100644
--- a/include/linux/zorro.h
+++ b/include/linux/zorro.h
@@ -52,7 +52,7 @@ struct zorro_driver {
     struct device_driver driver;
 };
 
-#define	to_zorro_driver(drv)	container_of(drv, struct zorro_driver, driver)
+#define	to_zorro_driver(drv)	container_of_const(drv, struct zorro_driver, driver)
 
 
 #define zorro_for_each_dev(dev)	\
-- 
2.45.2

Re: [PATCH] zorro: make match function take a const pointer

[Geert Uytterhoeven]

On Wed, Jul 10, 2024 at 9:34 AM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
> In commit d69d80484598 ("driver core: have match() callback in struct bus_type
> take a const *"), the match callback for busses was changed to take a const
> pointer to struct device_driver.  Unfortunatly I missed fixing up the zorro

Unfortunately

> code, and was only noticed after-the-fact by the kernel test robot.  Resolve
> this issue by properly changing the zorro_bus_match() function.
>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Fixes: d69d80484598 ("driver core: have match() callback in struct bus_type take a const *")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] zorro: make match function take a const pointer

[Greg Kroah-Hartman]

On Wed, Jul 10, 2024 at 09:51:30AM +0200, Geert Uytterhoeven wrote:
> On Wed, Jul 10, 2024 at 9:34 AM Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> > In commit d69d80484598 ("driver core: have match() callback in struct bus_type
> > take a const *"), the match callback for busses was changed to take a const
> > pointer to struct device_driver.  Unfortunatly I missed fixing up the zorro
> 
> Unfortunately

Thanks for the review!