Skip to contentSkip to conversation

zorro: make match function take a const pointer

PATCH In review Greg Kroah-Hartman 2 participants 3 messages Jul 10, 2024 m68k architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 zorro: make match function take a const pointer

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 <[email protected]>
Fixes d69d80484598 ("driver core: have match() callback in struct bus_type take a const *")
---
 drivers/zorro/zorro-driver.c | 4 ++--
 include/linux/zorro.h        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/zorro/zorro-driver.c +2 -2
index f49d19977e82..e7d3af1a223f 100644
@@ -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)
include/linux/zorro.h +1 -1
index db7416ed6057..f36c8d39553d 100644
@@ -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)	\
Signature · 1 line
2.45.2
maintainer Reviewed-by Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · 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

Unfortunately

Quoted 7 lines

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 <[email protected]>
Fixes d69d80484598 ("driver core: have match() callback in struct bus_type take a const *")

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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
#2 lore raw
Quoted 7 lines · Geert Uytterhoeven
Quoted 3 lines · 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

Unfortunately

Thanks for the review!