ARM: sa1100: make match function take a const pointer
PATCH 1/1 ARM: sa1100: 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 sa1111 code, and was only noticed after-the-fact by the kernel test robot. Resolve this issue by properly changing the sa111_match() function.
Cc Russell King <[email protected]>
Fixes d69d80484598 ("driver core: have match() callback in struct bus_type take a const *")
Reported-by kernel test robot <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- arch/arm/common/sa1111.c | 4 ++-- arch/arm/include/asm/hardware/sa1111.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/common/sa1111.c +2 -2
@@ -1339,10 +1339,10 @@ EXPORT_SYMBOL_GPL(sa1111_get_irq);* We model this as a regular bus type, and hang devices directly * off this. */ -static int sa1111_match (struct device *_dev,struct device_driver *_drv) +static int sa1111_match (struct device *_dev,const struct device_driver *_drv) {struct sa1111_dev *dev =to_sa1111_device (_dev); -struct sa1111_driver *drv =SA1111_DRV (_drv); +const struct sa1111_driver *drv =SA1111_DRV (_drv);return !!(dev->devid & drv->devid); }
arch/arm/include/asm/hardware/sa1111.h +1 -1
@@ -404,7 +404,7 @@ struct sa1111_driver {void (*remove)(struct sa1111_dev *); }; -#define SA1111_DRV (_d) container_of((_d), struct sa1111_driver, drv) +#define SA1111_DRV (_d) container_of_const((_d), struct sa1111_driver, drv)#define SA1111_DRIVER_NAME (_sadev) ((_sadev)->dev.driver->name)
Signature · 1 line
2.45.2