[PATCH v3 2/2] mfd: twl-core: Reset twl_priv using devm_add_action_or_reset()
From: Lee Jones
Date: Thu Nov 19 2026 - 14:50:06 EST
Register a devres cleanup action immediately after allocating twl_priv
with devm_kzalloc() so that twl_priv is automatically reset to NULL just
before its underlying memory is released on probe failure or driver
unbind. This removes the need to manually clear twl_priv in both
twl_remove() and the probe error unwind path.
Suggested-by: Andreas Kemnade <andreas@xxxxxxxxxxxx>
Reviewed-by: Andreas Kemnade <andreas@xxxxxxxxxxxx>
Signed-off-by: Lee Jones <lee@xxxxxxxxxx>
---
v1 => v3: Previously sent standalone - now rebased onto patch 1
drivers/mfd/twl-core.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 7784e000b995..cef729109126 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -713,7 +713,6 @@ static void twl_remove(struct i2c_client *client)
twl->client = NULL;
}
twl_priv->ready = false;
- twl_priv = NULL;
}
@@ -735,6 +734,11 @@ static void twl_unregister_device(void *data)
platform_device_unregister(data);
}
+static void twl_reset_priv(void *data)
+{
+ twl_priv = NULL;
+}
+
/* NOTE: This driver only handles a single twl4030/tps659x0 chip */
static int
twl_probe(struct i2c_client *client)
@@ -788,6 +792,10 @@ twl_probe(struct i2c_client *client)
goto out;
}
+ status = devm_add_action_or_reset(&client->dev, twl_reset_priv, NULL);
+ if (status)
+ goto out;
+
if ((id->driver_data) & TWL6030_CLASS) {
twl_priv->twl_id = TWL6030_CLASS_ID;
twl_priv->twl_map = &twl6030_map[0];
@@ -909,9 +917,6 @@ twl_probe(struct i2c_client *client)
if (status < 0)
twl_remove(client);
out:
- if (status < 0)
- twl_priv = NULL;
-
return status;
}
--
2.56.1.750.gf70dc682cf-goog