Commit af46fe8c authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman
Browse files

dio: Have dio_bus_match() callback take a const * 



drivers/dio/dio-driver.c:128:11: error: initialization of ‘int (*)(struct device *, const struct device_driver *)’ from incompatible pointer type ‘int (*)(struct device *, struct device_driver *)’ [-Werror=incompatible-pointer-types]
  128 |  .match = dio_bus_match,
      |           ^~~~~~~~~~~~~
drivers/dio/dio-driver.c:128:11: note: (near initialization for ‘dio_bus_type.match’)

Reported-by: default avatar <noreply@ellerman.id.au>
Fixes: d69d8048 ("driver core: have match() callback in struct bus_type take a const *")
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20240710074452.2841173-1-geert@linux-m68k.org


[ added dio.h change - gregkh ]
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c9add2e6

drivers/dio/dio-driver.c

+2 −2
Original line number Diff line number Diff line
@@ -110,10 +110,10 @@ void dio_unregister_driver(struct dio_driver *drv) 
 *  and 0 if there is no match.

 */



static int dio_bus_match(struct device *dev, struct device_driver *drv)

static int dio_bus_match(struct device *dev, const struct device_driver *drv)

{

	struct dio_dev *d = to_dio_dev(dev);

	struct dio_driver *dio_drv = to_dio_driver(drv);

	const struct dio_driver *dio_drv = to_dio_driver(drv);

	const struct dio_device_id *ids = dio_drv->id_table;



	if (!ids)

include/linux/dio.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ struct dio_driver { 
	struct device_driver driver;

};



#define to_dio_driver(drv)    container_of(drv, struct dio_driver, driver)

#define to_dio_driver(drv)    container_of_const(drv, struct dio_driver, driver)



/* DIO/DIO-II boards all have the following 8bit registers.

 * These are offsets from the base of the device.