Skip to contentSkip to conversation

dio: Have dio_bus_match() callback take a const *

PATCH In review Geert Uytterhoeven 2 participants 3 messages Jul 10, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 [email protected]
Fixes d69d804845985c29 ("driver core: have match() callback in struct bus_type take a const *")
---
 drivers/dio/dio-driver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dio/dio-driver.c +2 -2
index 2d9fa6011945d88b..12fa2d209dab9d3c 100644
@@ -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)
Signature · 1 line
2.34.1
#1 lore raw
Quoted 17 lines · Geert Uytterhoeven

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 [email protected]
Fixes d69d804845985c29 ("driver core: have match() callback in struct bus_type take a const *")
---
 drivers/dio/dio-driver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dio/dio-driver.c +0 -0
index 2d9fa6011945d88b..12fa2d209dab9d3c 100644

drivers/dio/dio-driver.c void dio_unregister_driver(struct dio_driver *drv) · line 116

Quoted 9 lines
drivers/dio/dio-driver.c +2 -2
@@ -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);

Same here, to_dio_driver() should be changed to use container_of_const()

thanks,

greg k-h

#2 lore raw
Quoted 21 lines · Greg Kroah-Hartman
Quoted 20 lines · Geert Uytterhoeven

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 [email protected]
Fixes d69d804845985c29 ("driver core: have match() callback in struct bus_type take a const *")
---
 drivers/dio/dio-driver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dio/dio-driver.c +0 -0
index 2d9fa6011945d88b..12fa2d209dab9d3c 100644
@@ -110,10 +110,10 @@ void dio_unregister_driver(struct dio_driver *drv)
  *  and 0 if there is no match.
  */
 
Quoted 8 lines

drivers/dio/dio-driver.c void dio_unregister_driver(struct dio_driver *drv) · line 116

Quoted 6 lines
drivers/dio/dio-driver.c +2 -2
-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);

Same here, to_dio_driver() should be changed to use container_of_const()

I've added that to the change when I've merged this to my tree, thanks!

greg k-h