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

i3c: move dev_to_i3cdev() to use container_of_const() 



The driver core is changing to pass some pointers as const, so move
dev_to_i3cdev() to use container_of_const() to handle this change.
dev_to_i3cdev() now properly keeps the const-ness of the pointer passed
into it, while as before it could be lost.

Acked-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230111113018.459199-3-gregkh@linuxfoundation.org


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

drivers/i3c/device.c

+0 −12
Original line number Diff line number Diff line
@@ -208,18 +208,6 @@ struct device *i3cdev_to_dev(struct i3c_device *i3cdev) 
}

EXPORT_SYMBOL_GPL(i3cdev_to_dev);



/**

 * dev_to_i3cdev() - Returns the I3C device containing @dev

 * @dev: device object

 *

 * Return: a pointer to an I3C device object.

 */

struct i3c_device *dev_to_i3cdev(struct device *dev)

{

	return container_of(dev, struct i3c_device, dev);

}

EXPORT_SYMBOL_GPL(dev_to_i3cdev);



/**

 * i3c_device_match_id() - Returns the i3c_device_id entry matching @i3cdev

 * @i3cdev: I3C device

include/linux/i3c/device.h

+8 −1
Original line number Diff line number Diff line
@@ -186,7 +186,14 @@ static inline struct i3c_driver *drv_to_i3cdrv(struct device_driver *drv) 
}



struct device *i3cdev_to_dev(struct i3c_device *i3cdev);

struct i3c_device *dev_to_i3cdev(struct device *dev);



/**

 * dev_to_i3cdev() - Returns the I3C device containing @dev

 * @dev: device object

 *

 * Return: a pointer to an I3C device object.

 */

#define dev_to_i3cdev(__dev)	container_of_const(__dev, struct i3c_device, dev)



const struct i3c_device_id *

i3c_device_match_id(struct i3c_device *i3cdev,