[v4,1/2] mtd: partitions: clarify __mtd_del_partition() name

Message ID 20190122114134.8199-1-miquel.raynal@bootlin.com
State New
Delegated to: Boris Brezillon
Headers show
Series
  • [v4,1/2] mtd: partitions: clarify __mtd_del_partition() name
Related show

Commit Message

Miquel Raynal Jan. 22, 2019, 11:41 a.m.
__mtd_del_partition() is a helper that must be called after the
partition lock has been taken. As there are already a few similar names
(mtd_del_partitions(), del_mtd_partitions(), __mtd_del_partitions()),
make this clear by renaming the helper mtd_del_partition_locked().

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---

Changes since v3:

Comments

Boris Brezillon Jan. 28, 2019, 9:37 a.m. | #1
On Tue, 2019-01-22 at 11:41:33 UTC, Miquel Raynal wrote:
> __mtd_del_partition() is a helper that must be called after the
> partition lock has been taken. As there are already a few similar names
> (mtd_del_partitions(), del_mtd_partitions(), __mtd_del_partitions()),
> make this clear by renaming the helper mtd_del_partition_locked().
> 
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

Applied to http://git.infradead.org/linux-mtd.git mtd/next, thanks.

Boris

Patch

=================
* Fix typo in commit log: s/ben/been/.

Changes since v2:
=================
* New patch.

 drivers/mtd/mtdpart.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index b6af41b04622..32beb9c2641f 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -627,20 +627,20 @@  int mtd_add_partition(struct mtd_info *parent, const char *name,
 EXPORT_SYMBOL_GPL(mtd_add_partition);
 
 /**
- * __mtd_del_partition - delete MTD partition
+ * mtd_del_partition_locked - delete MTD partition
  *
  * @priv: internal MTD struct for partition to be deleted
  *
  * This function must be called with the partitions mutex locked.
  */
-static int __mtd_del_partition(struct mtd_part *priv)
+static int mtd_del_partition_locked(struct mtd_part *priv)
 {
 	struct mtd_part *child, *next;
 	int err;
 
 	list_for_each_entry_safe(child, next, &mtd_partitions, list) {
 		if (child->parent == &priv->mtd) {
-			err = __mtd_del_partition(child);
+			err = mtd_del_partition_locked(child);
 			if (err)
 				return err;
 		}
@@ -670,7 +670,7 @@  int del_mtd_partitions(struct mtd_info *mtd)
 	mutex_lock(&mtd_partitions_mutex);
 	list_for_each_entry_safe(slave, next, &mtd_partitions, list)
 		if (slave->parent == mtd) {
-			ret = __mtd_del_partition(slave);
+			ret = mtd_del_partition_locked(slave);
 			if (ret < 0)
 				err = ret;
 		}
@@ -688,7 +688,7 @@  int mtd_del_partition(struct mtd_info *mtd, int partno)
 	list_for_each_entry_safe(slave, next, &mtd_partitions, list)
 		if ((slave->parent == mtd) &&
 		    (slave->mtd.index == partno)) {
-			ret = __mtd_del_partition(slave);
+			ret = mtd_del_partition_locked(slave);
 			break;
 		}
 	mutex_unlock(&mtd_partitions_mutex);