Skip to content
Snippets Groups Projects
Commit c9add2e6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

zorro: make match function take a const pointer


In commit d69d8048 ("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.  Unfortunately 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: d69d8048 ("driver core: have match() callback in struct bus_type take a const *")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20240710073413.495541-2-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 67c1ba55
No related branches found
No related tags found
No related merge requests found
...@@ -118,10 +118,10 @@ EXPORT_SYMBOL(zorro_unregister_driver); ...@@ -118,10 +118,10 @@ EXPORT_SYMBOL(zorro_unregister_driver);
* supported, and 0 if there is no match. * 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_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; const struct zorro_device_id *ids = zorro_drv->id_table;
if (!ids) if (!ids)
......
...@@ -52,7 +52,7 @@ struct zorro_driver { ...@@ -52,7 +52,7 @@ struct zorro_driver {
struct device_driver 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) \ #define zorro_for_each_dev(dev) \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment