Commit b57d5ffc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ARM: sa1100: make match function take a const pointer 



In commit d69d8048 ("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 <linux@armlinux.org.uk>
Fixes: d69d8048 ("driver core: have match() callback in struct bus_type take a const *")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/r/20240712093916.2121096-2-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e777798e

arch/arm/common/sa1111.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)