stuartl/linux-mainline
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux synced 2025-11-04 08:34:47 +10:00
Code Issues Releases Wiki Activity

dio: Have dio_bus_match() callback take a const *

Browse Source 
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: noreply@ellerman.id.au
Fixes: d69d804845 ("driver core: have match() callback in struct bus_type take a const *")
Signed-off-by: Geert 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Geert Uytterhoeven 2024-07-10 09:44:52 +02:00 committed by Greg Kroah-Hartman
parent c9add2e607
commit af46fe8c41
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/dio/dio-driver.c
View File

@ -110,10 +110,10 @@ void dio_unregister_driver(struct dio_driver *drv)
* and 0 if there is no match. * 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_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; const struct dio_device_id *ids = dio_drv->id_table;
if (!ids) if (!ids)

2
include/linux/dio.h
View File

@ -93,7 +93,7 @@ struct dio_driver {
struct device_driver 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. /* DIO/DIO-II boards all have the following 8bit registers.
* These are offsets from the base of the device. * These are offsets from the base of the device.