| Message ID | 20200227135227.12433-3-alexandru.ardelean@analog.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/8] iio: core: drop devm_iio_device_unregister() API call | expand |
On Thu, 27 Feb 2020 15:52:22 +0200 Alexandru Ardelean <alexandru.ardelean@analog.com> wrote: > It's unused so far, so it can't be removed. Also makes sense to remove it > to discourage weird uses of this call during review. > > This is the last user of 'devm_iio_device_match()', so it can be removed as > well in this patch. > > Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> Applied. Thanks, J > --- > .../driver-api/driver-model/devres.rst | 1 - > drivers/iio/industrialio-core.c | 31 ------------------- > include/linux/iio/iio.h | 2 -- > 3 files changed, 34 deletions(-) > > diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst > index 1431d5e44abc..6ae6c67dfec0 100644 > --- a/Documentation/driver-api/driver-model/devres.rst > +++ b/Documentation/driver-api/driver-model/devres.rst > @@ -284,7 +284,6 @@ I2C > > IIO > devm_iio_device_alloc() > - devm_iio_device_free() > devm_iio_device_register() > devm_iio_kfifo_allocate() > devm_iio_kfifo_free() > diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c > index e4011f8431f9..ebe338a0494f 100644 > --- a/drivers/iio/industrialio-core.c > +++ b/drivers/iio/industrialio-core.c > @@ -1539,17 +1539,6 @@ static void devm_iio_device_release(struct device *dev, void *res) > iio_device_free(*(struct iio_dev **)res); > } > > -int devm_iio_device_match(struct device *dev, void *res, void *data) > -{ > - struct iio_dev **r = res; > - if (!r || !*r) { > - WARN_ON(!r || !*r); > - return 0; > - } > - return *r == data; > -} > -EXPORT_SYMBOL_GPL(devm_iio_device_match); > - > /** > * devm_iio_device_alloc - Resource-managed iio_device_alloc() > * @dev: Device to allocate iio_dev for > @@ -1558,9 +1547,6 @@ EXPORT_SYMBOL_GPL(devm_iio_device_match); > * Managed iio_device_alloc. iio_dev allocated with this function is > * automatically freed on driver detach. > * > - * If an iio_dev allocated with this function needs to be freed separately, > - * devm_iio_device_free() must be used. > - * > * RETURNS: > * Pointer to allocated iio_dev on success, NULL on failure. > */ > @@ -1585,23 +1571,6 @@ struct iio_dev *devm_iio_device_alloc(struct device *dev, int sizeof_priv) > } > EXPORT_SYMBOL_GPL(devm_iio_device_alloc); > > -/** > - * devm_iio_device_free - Resource-managed iio_device_free() > - * @dev: Device this iio_dev belongs to > - * @iio_dev: the iio_dev associated with the device > - * > - * Free iio_dev allocated with devm_iio_device_alloc(). > - */ > -void devm_iio_device_free(struct device *dev, struct iio_dev *iio_dev) > -{ > - int rc; > - > - rc = devres_release(dev, devm_iio_device_release, > - devm_iio_device_match, iio_dev); > - WARN_ON(rc); > -} > -EXPORT_SYMBOL_GPL(devm_iio_device_free); > - > /** > * iio_chrdev_open() - chrdev file open for buffer access and ioctls > * @inode: Inode structure for identifying the device in the file system > diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h > index 0eb9e8d7ec68..2920c065ab9b 100644 > --- a/include/linux/iio/iio.h > +++ b/include/linux/iio/iio.h > @@ -686,9 +686,7 @@ static inline struct iio_dev *iio_priv_to_dev(void *priv) > } > > void iio_device_free(struct iio_dev *indio_dev); > -int devm_iio_device_match(struct device *dev, void *res, void *data); > struct iio_dev *devm_iio_device_alloc(struct device *dev, int sizeof_priv); > -void devm_iio_device_free(struct device *dev, struct iio_dev *indio_dev); > struct iio_trigger *devm_iio_trigger_alloc(struct device *dev, > const char *fmt, ...); > void devm_iio_trigger_free(struct device *dev, struct iio_trigger *iio_trig);
diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index 1431d5e44abc..6ae6c67dfec0 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -284,7 +284,6 @@ I2C IIO devm_iio_device_alloc() - devm_iio_device_free() devm_iio_device_register() devm_iio_kfifo_allocate() devm_iio_kfifo_free() diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index e4011f8431f9..ebe338a0494f 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1539,17 +1539,6 @@ static void devm_iio_device_release(struct device *dev, void *res) iio_device_free(*(struct iio_dev **)res); } -int devm_iio_device_match(struct device *dev, void *res, void *data) -{ - struct iio_dev **r = res; - if (!r || !*r) { - WARN_ON(!r || !*r); - return 0; - } - return *r == data; -} -EXPORT_SYMBOL_GPL(devm_iio_device_match); - /** * devm_iio_device_alloc - Resource-managed iio_device_alloc() * @dev: Device to allocate iio_dev for @@ -1558,9 +1547,6 @@ EXPORT_SYMBOL_GPL(devm_iio_device_match); * Managed iio_device_alloc. iio_dev allocated with this function is * automatically freed on driver detach. * - * If an iio_dev allocated with this function needs to be freed separately, - * devm_iio_device_free() must be used. - * * RETURNS: * Pointer to allocated iio_dev on success, NULL on failure. */ @@ -1585,23 +1571,6 @@ struct iio_dev *devm_iio_device_alloc(struct device *dev, int sizeof_priv) } EXPORT_SYMBOL_GPL(devm_iio_device_alloc); -/** - * devm_iio_device_free - Resource-managed iio_device_free() - * @dev: Device this iio_dev belongs to - * @iio_dev: the iio_dev associated with the device - * - * Free iio_dev allocated with devm_iio_device_alloc(). - */ -void devm_iio_device_free(struct device *dev, struct iio_dev *iio_dev) -{ - int rc; - - rc = devres_release(dev, devm_iio_device_release, - devm_iio_device_match, iio_dev); - WARN_ON(rc); -} -EXPORT_SYMBOL_GPL(devm_iio_device_free); - /** * iio_chrdev_open() - chrdev file open for buffer access and ioctls * @inode: Inode structure for identifying the device in the file system diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h index 0eb9e8d7ec68..2920c065ab9b 100644 --- a/include/linux/iio/iio.h +++ b/include/linux/iio/iio.h @@ -686,9 +686,7 @@ static inline struct iio_dev *iio_priv_to_dev(void *priv) } void iio_device_free(struct iio_dev *indio_dev); -int devm_iio_device_match(struct device *dev, void *res, void *data); struct iio_dev *devm_iio_device_alloc(struct device *dev, int sizeof_priv); -void devm_iio_device_free(struct device *dev, struct iio_dev *indio_dev); struct iio_trigger *devm_iio_trigger_alloc(struct device *dev, const char *fmt, ...); void devm_iio_trigger_free(struct device *dev, struct iio_trigger *iio_trig);
It's unused so far, so it can't be removed. Also makes sense to remove it to discourage weird uses of this call during review. This is the last user of 'devm_iio_device_match()', so it can be removed as well in this patch. Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> --- .../driver-api/driver-model/devres.rst | 1 - drivers/iio/industrialio-core.c | 31 ------------------- include/linux/iio/iio.h | 2 -- 3 files changed, 34 deletions(-)