[PATCH] mfd: twl-core: Reset twl_priv using devm_add_action_or_reset()

[PATCH] mfd: twl-core: Reset twl_priv using devm_add_action_or_reset()

[Lee Jones]

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@kemnade.info>
Signed-off-by: Lee Jones <lee@kernel.org>
---
 drivers/mfd/twl-core.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 21fc0acb827b..6077a87282f5 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -711,7 +711,6 @@ static void twl_remove(struct i2c_client *client)
 		twl->client = NULL;
 	}
 	twl_priv->ready = false;
-	twl_priv = NULL;
 }
 
 
@@ -728,6 +727,11 @@ static const struct mfd_cell twl6032_cells[] = {
 	{ .name = "twl6032-clk" },
 };
 
+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)
@@ -776,6 +780,10 @@ twl_probe(struct i2c_client *client)
 		goto free;
 	}
 
+	status = devm_add_action_or_reset(&client->dev, twl_reset_priv, NULL);
+	if (status)
+		goto free;
+
 	if ((id->driver_data) & TWL6030_CLASS) {
 		twl_priv->twl_id = TWL6030_CLASS_ID;
 		twl_priv->twl_map = &twl6030_map[0];
@@ -906,10 +914,8 @@ twl_probe(struct i2c_client *client)
 	if (status < 0)
 		twl_remove(client);
 free:
-	if (status < 0) {
+	if (status < 0)
 		platform_device_unregister(pdev);
-		twl_priv = NULL;
-	}
 
 	return status;
 }
-- 
2.56.0.398.g882cbad275-goog

Re: [PATCH] mfd: twl-core: Reset twl_priv using devm_add_action_or_reset()

[Andreas Kemnade]

On Thu,  5 Nov 2026 11:03:23 +0000
Lee Jones <lee@kernel.org> wrote:

> 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@kemnade.info>
> Signed-off-by: Lee Jones <lee@kernel.org>

Reviewed-by: Andreas Kemnade <andreas@kemnade.info>
> ---
>  drivers/mfd/twl-core.c | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
> index 21fc0acb827b..6077a87282f5 100644
> --- a/drivers/mfd/twl-core.c
> +++ b/drivers/mfd/twl-core.c
> @@ -711,7 +711,6 @@ static void twl_remove(struct i2c_client *client)
>  		twl->client = NULL;
>  	}
>  	twl_priv->ready = false;
> -	twl_priv = NULL;
>  }
>  
>  
> @@ -728,6 +727,11 @@ static const struct mfd_cell twl6032_cells[] = {
>  	{ .name = "twl6032-clk" },
>  };
>  
> +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)
> @@ -776,6 +780,10 @@ twl_probe(struct i2c_client *client)
>  		goto free;
>  	}
>  
> +	status = devm_add_action_or_reset(&client->dev, twl_reset_priv, NULL);
> +	if (status)
> +		goto free;
> +
>  	if ((id->driver_data) & TWL6030_CLASS) {
>  		twl_priv->twl_id = TWL6030_CLASS_ID;
>  		twl_priv->twl_map = &twl6030_map[0];
> @@ -906,10 +914,8 @@ twl_probe(struct i2c_client *client)
>  	if (status < 0)
>  		twl_remove(client);
>  free:
> -	if (status < 0) {
> +	if (status < 0)
>  		platform_device_unregister(pdev);
> -		twl_priv = NULL;
> -	}
>  
>  	return status;
>  }