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.  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: d69d80484598 ("driver core: have match() callback in struct bus_type take a const *")
Reported-by: kernel test robot <lkp@intel.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20240710073413.495541-2-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c
index f49d19977e82a71808912acf7119abdfa47dc0f7..e7d3af1a223f9abf725db4ee280870a9d31a698b 100644 (file)
--- 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 db7416ed60572a7e694657ed124bae2c1af59da6..f36c8d39553d868d889b3e452c4218c0d4ef8de0 100644 (file)
--- 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)        \