linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexandru Ardelean <alexandru.ardelean@analog.com>
To: <linux-iio@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <jic23@kernel.org>, Alexandru Ardelean <alexandru.ardelean@analog.com>
Subject: [PATCH 3/8] iio: core: drop devm_iio_device_free() API call
Date: Thu, 27 Feb 2020 15:52:22 +0200	[thread overview]
Message-ID: <20200227135227.12433-3-alexandru.ardelean@analog.com> (raw)
In-Reply-To: <20200227135227.12433-1-alexandru.ardelean@analog.com>

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(-)

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);
-- 
2.20.1


  parent reply	other threads:[~2020-02-27 14:43 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-27 13:52 [PATCH 1/8] iio: core: drop devm_iio_device_unregister() API call Alexandru Ardelean
2020-02-27 13:52 ` [PATCH 2/8] iio: core: drop devm_iio_triggered_buffer_cleanup() " Alexandru Ardelean
2020-04-12 12:33   ` Jonathan Cameron
2020-02-27 13:52 ` Alexandru Ardelean [this message]
2020-04-12 12:36   ` [PATCH 3/8] iio: core: drop devm_iio_device_free() " Jonathan Cameron
2020-02-27 13:52 ` [PATCH 4/8] iio: core: drop devm_iio_trigger_unregister() " Alexandru Ardelean
2020-04-12 12:51   ` Jonathan Cameron
2020-02-27 13:52 ` [PATCH 5/8] iio: core: drop devm_iio_trigger_free() " Alexandru Ardelean
2020-04-12 12:57   ` Jonathan Cameron
2020-02-27 13:52 ` [PATCH 6/8] iio: inkern: drop devm_iio_channel_release{_all} API calls Alexandru Ardelean
2020-04-12 12:58   ` Jonathan Cameron
2020-02-27 13:52 ` [PATCH 7/8] iio: buffer: drop devm_iio_hw_consumer_free() API call Alexandru Ardelean
2020-04-12 13:00   ` Jonathan Cameron
2020-02-27 13:52 ` [PATCH 8/8] iio: buffer: drop devm_iio_kfifo_free() " Alexandru Ardelean
2020-04-12 13:01   ` Jonathan Cameron
2020-04-12 14:21     ` Ardelean, Alexandru
2020-03-16  9:09 ` [PATCH 1/8] iio: core: drop devm_iio_device_unregister() " Ardelean, Alexandru
2020-03-16 11:45   ` Jonathan Cameron
2020-04-12 11:55 ` Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200227135227.12433-3-alexandru.ardelean@analog.com \
    --to=alexandru.ardelean@analog.com \
    --cc=jic23@kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).