From: Kryštof Černý <cleverline1mc@gmail.com>

Refactored the driver to devm_kzalloc() from kzalloc(), so the future
driver edits are easier and less error-prone.

Signed-off-by: Kryštof Černý <cleverline1mc@gmail.com>
---
 drivers/w1/masters/ds2482.c | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/drivers/w1/masters/ds2482.c b/drivers/w1/masters/ds2482.c
index a2ecbb863c57f38bffc8e3cd463db1940e603179..b2157869067d52f79d618e163b6cd96dbc7bee60 100644
--- a/drivers/w1/masters/ds2482.c
+++ b/drivers/w1/masters/ds2482.c
@@ -451,11 +451,9 @@ static int ds2482_probe(struct i2c_client *client)
 				     I2C_FUNC_SMBUS_BYTE))
 		return -ENODEV;
 
-	data = kzalloc(sizeof(struct ds2482_data), GFP_KERNEL);
-	if (!data) {
-		err = -ENOMEM;
-		goto exit;
-	}
+	data = devm_kzalloc(&client->dev, sizeof(struct ds2482_data), GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
 
 	data->client = client;
 	i2c_set_clientdata(client, data);
@@ -463,7 +461,7 @@ static int ds2482_probe(struct i2c_client *client)
 	/* Reset the device (sets the read_ptr to status) */
 	if (ds2482_send_cmd(data, DS2482_CMD_RESET) < 0) {
 		dev_warn(&client->dev, "DS2482 reset failed.\n");
-		goto exit_free;
+		return err;
 	}
 
 	/* Sleep at least 525ns to allow the reset to complete */
@@ -474,7 +472,7 @@ static int ds2482_probe(struct i2c_client *client)
 	if (temp1 != (DS2482_REG_STS_LL | DS2482_REG_STS_RST)) {
 		dev_warn(&client->dev, "DS2482 reset status "
 			 "0x%02X - not a DS2482\n", temp1);
-		goto exit_free;
+		return err;
 	}
 
 	/* Detect the 8-port version */
@@ -505,21 +503,15 @@ static int ds2482_probe(struct i2c_client *client)
 		err = w1_add_master_device(&data->w1_ch[idx].w1_bm);
 		if (err) {
 			data->w1_ch[idx].pdev = NULL;
-			goto exit_w1_remove;
+			for (idx = 0; idx < data->w1_count; idx++) {
+				if (data->w1_ch[idx].pdev != NULL)
+					w1_remove_master_device(&data->w1_ch[idx].w1_bm);
+			}
+			return err;
 		}
 	}
 
 	return 0;
-
-exit_w1_remove:
-	for (idx = 0; idx < data->w1_count; idx++) {
-		if (data->w1_ch[idx].pdev != NULL)
-			w1_remove_master_device(&data->w1_ch[idx].w1_bm);
-	}
-exit_free:
-	kfree(data);
-exit:
-	return err;
 }
 
 static void ds2482_remove(struct i2c_client *client)
@@ -532,9 +524,6 @@ static void ds2482_remove(struct i2c_client *client)
 		if (data->w1_ch[idx].pdev != NULL)
 			w1_remove_master_device(&data->w1_ch[idx].w1_bm);
 	}
-
-	/* Free the memory */
-	kfree(data);
 }
 
 /*

-- 
2.39.5

On 29/11/2024 10:53, Kryštof Černý via B4 Relay wrote:
>  	/* Detect the 8-port version */
> @@ -505,21 +503,15 @@ static int ds2482_probe(struct i2c_client *client)
>  		err = w1_add_master_device(&data->w1_ch[idx].w1_bm);
>  		if (err) {
>  			data->w1_ch[idx].pdev = NULL;
> -			goto exit_w1_remove;
> +			for (idx = 0; idx < data->w1_count; idx++) {
> +				if (data->w1_ch[idx].pdev != NULL)
> +					w1_remove_master_device(&data->w1_ch[idx].w1_bm);
> +			}
> +			return err;
>  		}
>  	}
>  
>  	return 0;
> -
> -exit_w1_remove:
> -	for (idx = 0; idx < data->w1_count; idx++) {
> -		if (data->w1_ch[idx].pdev != NULL)
> -			w1_remove_master_device(&data->w1_ch[idx].w1_bm);

This exit path should stay.

> -	}
> -exit_free:
> -	kfree(data);
> -exit:
> -	return err;
>  }
>  
Best regards,
Krzysztof