linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
To: Dmitry Osipenko <digetx@gmail.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>,
	Vladimir Zapolskiy <vz@mleia.com>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH v2 6/7] regulator: cleanup regulator_ena_gpio_free()
Date: Wed, 12 Aug 2020 03:31:37 +0200	[thread overview]
Message-ID: <3ff002c7aa3bd774491af4291a9df23541fcf892.1597195321.git.mirq-linux@rere.qmqm.pl> (raw)
In-Reply-To: <cover.1597195321.git.mirq-linux@rere.qmqm.pl>

Since only regulator_ena_gpio_request() allocates rdev->ena_pin, and it
guarantees that same gpiod gets same pin structure, it is enough to
compare just the pointers. Also we know there can be only one matching
entry on the list. Rework the code take advantage of the facts.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/regulator/core.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 448a267641df..bfd4114d6654 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2260,19 +2260,19 @@ static void regulator_ena_gpio_free(struct regulator_dev *rdev)
 
 	/* Free the GPIO only in case of no use */
 	list_for_each_entry_safe(pin, n, &regulator_ena_gpio_list, list) {
-		if (pin->gpiod == rdev->ena_pin->gpiod) {
-			if (pin->request_count <= 1) {
-				pin->request_count = 0;
-				gpiod_put(pin->gpiod);
-				list_del(&pin->list);
-				kfree(pin);
-				rdev->ena_pin = NULL;
-				return;
-			} else {
-				pin->request_count--;
-			}
-		}
+		if (pin != rdev->ena_pin)
+			continue;
+
+		if (--pin->request_count)
+			break;
+
+		gpiod_put(pin->gpiod);
+		list_del(&pin->list);
+		kfree(pin);
+		break;
 	}
+
+	rdev->ena_pin = NULL;
 }
 
 /**
-- 
2.20.1


  parent reply	other threads:[~2020-08-12  1:31 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-12  1:31 [PATCH v2 0/7] regulator: fix deadlock vs memory reclaim Michał Mirosław
2020-08-12  1:31 ` [PATCH v2 1/7] regulator: push allocation in regulator_init_coupling() outside of lock Michał Mirosław
2020-08-12  1:31 ` [PATCH v2 2/7] regulator: push allocation in regulator_ena_gpio_request() out " Michał Mirosław
2020-08-18  0:25   ` Dmitry Osipenko
2020-08-12  1:31 ` [PATCH v2 3/7] regulator: push allocations in create_regulator() outside " Michał Mirosław
2020-08-12  1:31 ` [PATCH v2 5/7] regulator: plug of_node leak in regulator_register()'s error path Michał Mirosław
2020-08-12  6:29   ` Vladimir Zapolskiy
2020-08-12 14:09     ` Michał Mirosław
2020-08-13  8:29       ` Vladimir Zapolskiy
2020-08-12  1:31 ` [PATCH v2 4/7] regulator: push allocation in set_consumer_device_supply() out of lock Michał Mirosław
2020-08-12  1:31 ` Michał Mirosław [this message]
2020-08-12  1:31 ` [PATCH v2 7/7] regulator: remove superfluous lock in regulator_resolve_coupling() Michał Mirosław

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=3ff002c7aa3bd774491af4291a9df23541fcf892.1597195321.git.mirq-linux@rere.qmqm.pl \
    --to=mirq-linux@rere.qmqm.pl \
    --cc=broonie@kernel.org \
    --cc=digetx@gmail.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=vz@mleia.com \
    --subject='Re: [PATCH v2 6/7] regulator: cleanup regulator_ena_gpio_free()' \
    /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

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox