mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Heiner Kallweit <hkallweit1@gmail.com>
To: Arnd Bergmann <arnd@arndb.de>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH 13/13] eeprom: ee1004: Add helper ee1004_cleanup
Date: Mon, 24 May 2021 22:18:23 +0200	[thread overview]
Message-ID: <9738cbc7-458d-276f-4012-66551f105d90@gmail.com> (raw)
In-Reply-To: <bd8439bc-3a6f-fd52-5fd1-bf9782061612@gmail.com>

Factor out the cleanup code to a new helper ee1004_cleanup().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/misc/eeprom/ee1004.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/misc/eeprom/ee1004.c b/drivers/misc/eeprom/ee1004.c
index 5173d040c..00f61a83d 100644
--- a/drivers/misc/eeprom/ee1004.c
+++ b/drivers/misc/eeprom/ee1004.c
@@ -159,6 +159,15 @@ static struct bin_attribute *ee1004_attrs[] = {
 
 BIN_ATTRIBUTE_GROUPS(ee1004);
 
+static void ee1004_cleanup(int idx)
+{
+	if (--ee1004_dev_count == 0)
+		while (--idx >= 0) {
+			i2c_unregister_device(ee1004_set_page[idx]);
+			ee1004_set_page[idx] = NULL;
+		}
+}
+
 static int ee1004_probe(struct i2c_client *client)
 {
 	int err, cnr = 0;
@@ -205,12 +214,7 @@ static int ee1004_probe(struct i2c_client *client)
 	return 0;
 
  err_clients:
-	if (--ee1004_dev_count == 0) {
-		for (cnr--; cnr >= 0; cnr--) {
-			i2c_unregister_device(ee1004_set_page[cnr]);
-			ee1004_set_page[cnr] = NULL;
-		}
-	}
+	ee1004_cleanup(cnr);
 	mutex_unlock(&ee1004_bus_lock);
 
 	return err;
@@ -218,16 +222,9 @@ static int ee1004_probe(struct i2c_client *client)
 
 static int ee1004_remove(struct i2c_client *client)
 {
-	int i;
-
 	/* Remove page select clients if this is the last device */
 	mutex_lock(&ee1004_bus_lock);
-	if (--ee1004_dev_count == 0) {
-		for (i = 0; i < EE1004_NUM_PAGES; i++) {
-			i2c_unregister_device(ee1004_set_page[i]);
-			ee1004_set_page[i] = NULL;
-		}
-	}
+	ee1004_cleanup(EE1004_NUM_PAGES);
 	mutex_unlock(&ee1004_bus_lock);
 
 	return 0;
-- 
2.31.1



      parent reply	other threads:[~2021-05-24 20:19 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-24 20:08 [PATCH 00/13] eeprom: ee1004: improvements Heiner Kallweit
2021-05-24 20:08 ` [PATCH 01/13] eeprom: ee1004: Use kobj_to_i2c_client to simplify the code Heiner Kallweit
2021-05-24 20:09 ` [PATCH 02/13] eeprom: ee1004: Remove not needed check in ee1004_read Heiner Kallweit
2021-05-24 20:10 ` [PATCH 03/13] eeprom: ee1004: Remove not needed check in ee1004_eeprom_read Heiner Kallweit
2021-05-24 20:11 ` [PATCH 04/13] eeprom: ee1004: Remove usage of i2c_adapter_id in adapter comparison Heiner Kallweit
2021-05-24 20:12 ` [PATCH 05/13] eeprom: ee1004: Improve check for SMBUS features Heiner Kallweit
2021-05-24 20:13 ` [PATCH 06/13] eeprom: ee1004: Improve creating dummy devices Heiner Kallweit
2021-05-24 20:13 ` [PATCH 07/13] eeprom: ee1004: Switch to i2c probe_new callback Heiner Kallweit
2021-05-24 20:14 ` [PATCH 08/13] eeprom: ee1004: Cache current page at initialization of first device only Heiner Kallweit
2021-05-24 20:15 ` [PATCH 09/13] eeprom: ee1004: Factor out setting page to ee1004_set_current_page Heiner Kallweit
2021-05-24 20:16 ` [PATCH 10/13] eeprom: ee1004: Improve error handling in ee1004_read Heiner Kallweit
2021-05-24 20:16 ` [PATCH 11/13] eeprom: ee1004: Move call to ee1004_set_current_page to ee1004_eeprom_read Heiner Kallweit
2021-05-24 20:17 ` [PATCH 12/13] eeprom: ee1004: Add constant EE1004_NUM_PAGES Heiner Kallweit
2021-05-24 20:18 ` Heiner Kallweit [this message]

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=9738cbc7-458d-276f-4012-66551f105d90@gmail.com \
    --to=hkallweit1@gmail.com \
    --cc=arnd@arndb.de \
    --cc=gregkh@linuxfoundation.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

all inboxes | Powered by JetHome®