Input: twl6040-vibra - use devm functions

PATCH In review Fabio Estevam 2 participants 2 messages Apr 25, 2014

Subsystems (2)

HID Input drivers

lore

Share & tools

lore

Fabio Estevam

author

2014-04-25 14:38 UTC #0 lore raw

PATCH v2 1/1 Input: twl6040-vibra - use devm functions

From: Fabio Estevam <[email protected]>

Using devm_regulator_bulk_get() and devm_input_allocate_device() can make the code cleaner and smaller as we do not need to call regulator_bulk_free() in the error and remove paths.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Also use devm_input_allocate_device()

 drivers/input/misc/twl6040-vibra.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

drivers/input/misc/twl6040-vibra.c +8 ~~-13~~

index 77dc23b..76aa602 100644
@@ -323,8 +323,9 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
 	 * When booted with Device tree the regulators are attached to the
 	 * parent device (twl6040 MFD core)
 	 */
-	ret = regulator_bulk_get(twl6040_core_dev, ARRAY_SIZE(info->supplies),
-				 info->supplies);
+	ret = devm_regulator_bulk_get(twl6040_core_dev,
+				      ARRAY_SIZE(info->supplies),
+				      info->supplies);
 	if (ret) {
 		dev_err(info->dev, "couldn't get regulators %d\n", ret);
 		return ret;

@@ -336,7 +337,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
 		if (ret) {
 			dev_err(info->dev, "failed to set VDDVIBL volt %d\n",
 				ret);
-			goto err_regulator;
+			return ret;
 		}
 	}

@@ -346,17 +347,16 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
 		if (ret) {
 			dev_err(info->dev, "failed to set VDDVIBR volt %d\n",
 				ret);
-			goto err_regulator;
+			return ret;
 		}
 	}
 
 	INIT_WORK(&info->play_work, vibra_play_work);
 
-	info->input_dev = input_allocate_device();
+	info->input_dev = devm_input_allocate_device(&pdev->dev);
 	if (info->input_dev == NULL) {
 		dev_err(info->dev, "couldn't allocate input device\n");
-		ret = -ENOMEM;
-		goto err_regulator;
+		return -ENOMEM;
 	}
 
 	input_set_drvdata(info->input_dev, info);

@@ -370,7 +370,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
 	ret = input_ff_create_memless(info->input_dev, NULL, vibra_play);
 	if (ret < 0) {
 		dev_err(info->dev, "couldn't register vibrator to FF\n");
-		goto err_ialloc;
+		return ret;
 	}
 
 	ret = input_register_device(info->input_dev);

@@ -385,10 +385,6 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
 
 err_iff:
 	input_ff_destroy(info->input_dev);
-err_ialloc:
-	input_free_device(info->input_dev);
-err_regulator:
-	regulator_bulk_free(ARRAY_SIZE(info->supplies), info->supplies);
 	return ret;
 }

@@ -397,7 +393,6 @@ static int twl6040_vibra_remove(struct platform_device *pdev)
 	struct vibra_info *info = platform_get_drvdata(pdev);
 
 	input_unregister_device(info->input_dev);
-	regulator_bulk_free(ARRAY_SIZE(info->supplies), info->supplies);
 
 	return 0;
 }

Signature · 1 line

1.8.3.2

Dmitry Torokhov

maintainer

2014-04-25 16:41 UTC #1 lore raw

Hi Fabio,

Quoted 70 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Using devm_regulator_bulk_get() and devm_input_allocate_device() can make the code cleaner and smaller as we do not need to call regulator_bulk_free() in the error and remove paths.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Also use devm_input_allocate_device()

 drivers/input/misc/twl6040-vibra.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

drivers/input/misc/twl6040-vibra.c +8 -8

index 77dc23b..76aa602 100644
@@ -323,8 +323,9 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
 	 * When booted with Device tree the regulators are attached to the
 	 * parent device (twl6040 MFD core)
 	 */
-	ret = regulator_bulk_get(twl6040_core_dev, ARRAY_SIZE(info->supplies),
-				 info->supplies);
+	ret = devm_regulator_bulk_get(twl6040_core_dev,
+				      ARRAY_SIZE(info->supplies),
+				      info->supplies);
 	if (ret) {
 		dev_err(info->dev, "couldn't get regulators %d\n", ret);
 		return ret;

@@ -336,7 +337,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
 		if (ret) {
 			dev_err(info->dev, "failed to set VDDVIBL volt %d\n",
 				ret);
-			goto err_regulator;
+			return ret;
 		}
 	}

@@ -346,17 +347,16 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
 		if (ret) {
 			dev_err(info->dev, "failed to set VDDVIBR volt %d\n",
 				ret);
-			goto err_regulator;
+			return ret;
 		}
 	}
 
 	INIT_WORK(&info->play_work, vibra_play_work);
 
-	info->input_dev = input_allocate_device();
+	info->input_dev = devm_input_allocate_device(&pdev->dev);
 	if (info->input_dev == NULL) {
 		dev_err(info->dev, "couldn't allocate input device\n");
-		ret = -ENOMEM;
-		goto err_regulator;
+		return -ENOMEM;
 	}
 
 	input_set_drvdata(info->input_dev, info);

@@ -370,7 +370,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
 	ret = input_ff_create_memless(info->input_dev, NULL, vibra_play);
 	if (ret < 0) {
 		dev_err(info->dev, "couldn't register vibrator to FF\n");
-		goto err_ialloc;
+		return ret;
 	}
 
 	ret = input_register_device(info->input_dev);

drivers/input/misc/twl6040-vibra.c static int twl6040_vibra_probe(struct platform_device *pdev) · line 387

Quoted 3 lines

drivers/input/misc/twl6040-vibra.c +0 -0

@@ -385,10 +385,6 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
 
 err_iff:
 	input_ff_destroy(info->input_dev);

This is not strictly needed (input_dev_release will clean it up automatically).

drivers/input/misc/twl6040-vibra.c static int twl6040_vibra_remove(struct platform_device *pdev) · line 395

Quoted 11 lines

drivers/input/misc/twl6040-vibra.c +0 -4

-err_ialloc:
-	input_free_device(info->input_dev);
-err_regulator:
-	regulator_bulk_free(ARRAY_SIZE(info->supplies), info->supplies);
 	return ret;
 }

@@ -397,7 +393,6 @@ static int twl6040_vibra_remove(struct platform_device *pdev)
 	struct vibra_info *info = platform_get_drvdata(pdev);
 
 	input_unregister_device(info->input_dev);

You do not need to call input_unregister_device() for managed input devices.

I edited the patch a bit and applied it.

Thanks.

Signature · 1 line

Dmitry