| Message ID | 20230111113018.459199-3-gregkh@linuxfoundation.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | None | expand |
On 11/01/2023 12:30:04+0100, Greg Kroah-Hartman wrote: > 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. > > Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> > Cc: linux-i3c@lists.infradead.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- > drivers/i3c/device.c | 12 ------------ > include/linux/i3c/device.h | 9 ++++++++- > 2 files changed, 8 insertions(+), 13 deletions(-) > > diff --git a/drivers/i3c/device.c b/drivers/i3c/device.c > index 9762630b917e..d111499061b2 100644 > --- a/drivers/i3c/device.c > +++ b/drivers/i3c/device.c > @@ -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 > diff --git a/include/linux/i3c/device.h b/include/linux/i3c/device.h > index 1c997abe868c..68b558929aec 100644 > --- a/include/linux/i3c/device.h > +++ b/include/linux/i3c/device.h > @@ -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, > -- > 2.39.0 >
diff --git a/drivers/i3c/device.c b/drivers/i3c/device.c index 9762630b917e..d111499061b2 100644 --- a/drivers/i3c/device.c +++ b/drivers/i3c/device.c @@ -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 diff --git a/include/linux/i3c/device.h b/include/linux/i3c/device.h index 1c997abe868c..68b558929aec 100644 --- a/include/linux/i3c/device.h +++ b/include/linux/i3c/device.h @@ -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,
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. Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: linux-i3c@lists.infradead.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/i3c/device.c | 12 ------------ include/linux/i3c/device.h | 9 ++++++++- 2 files changed, 8 insertions(+), 13 deletions(-)