Input: arizona-haptic - convert to use managed input devices

Using managed input device (via devm_input_allocate_device) simplifies error handling and driver removal paths and also silences CID# 712569.

Signed-off-by Dmitry Torokhov <[email protected]>

---
 drivers/input/misc/arizona-haptics.c | 52

++++++++++++------------------------ 1 file changed, 17 insertions(+), 35 deletions(-)

(quoted diff) +0 -0

b/drivers/input/misc/arizona-haptics.c index 4dbbed7..54ebef2 100644

drivers/input/misc/arizona-haptics.c +8 -8

@@ -152,7 +152,7 @@ static int arizona_haptics_probe(struct platform_device
 *pdev) {
 	struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
 	struct arizona_haptics *haptics;
-	int ret;
+	int error;
 
 	haptics = devm_kzalloc(&pdev->dev, sizeof(*haptics), GFP_KERNEL);
 	if (!haptics)

@@ -160,18 +160,18 @@ static int arizona_haptics_probe(struct
 platform_device *pdev)
 
 	haptics->arizona = arizona;
 
-	ret = regmap_update_bits(arizona->regmap, ARIZONA_HAPTICS_CONTROL_1,
-				 ARIZONA_HAP_ACT, arizona->pdata.hap_act);
-	if (ret != 0) {
+	error = regmap_update_bits(arizona->regmap, ARIZONA_HAPTICS_CONTROL_1,
+				   ARIZONA_HAP_ACT, arizona->pdata.hap_act);
+	if (error) {
 		dev_err(arizona->dev, "Failed to set haptics actuator: %d\n",
-			ret);
-		return ret;
+			error);
+		return error;
 	}
 
 	INIT_WORK(&haptics->work, arizona_haptics_work);
 
-	haptics->input_dev = input_allocate_device();
-	if (haptics->input_dev == NULL) {
+	haptics->input_dev = devm_input_allocate_device(&pdev->dev);
+	if (!haptics->input_dev) {
 		dev_err(arizona->dev, "Failed to allocate input device\n");
 		return -ENOMEM;

drivers/input/misc/arizona-haptics.c +0 -0

 	}

Hi,
It seems to me that swapping error for ret buries the functional changes in the patch...
would it be better to split them into a second cleanup patch?

Quoted 4 lines · Joshua Clayton

Hi,
It seems to me that swapping error for ret buries the functional changes in the patch...
would it be better to split them into a second cleanup patch?

Fair enough, although I am not sure if I ever get to the renaming again ;)

Thanks.

Signature · 14 lines

Dmitry


Input: arizona-haptic - convert to use managed input devices

From: Dmitry Torokhov <[email protected]>

Using managed input device (via devm_input_allocate_device) simplifies
error handling and driver removal paths and also silences CID# 712569.

Signed-off-by: Dmitry Torokhov <[email protected]>
---
 drivers/input/misc/arizona-haptics.c |   26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

drivers/input/misc/arizona-haptics.c +4 -22

index 4dbbed7..4bf6785 100644
@@ -170,8 +170,8 @@ static int arizona_haptics_probe(struct platform_device *pdev)
 
 	INIT_WORK(&haptics->work, arizona_haptics_work);
 
-	haptics->input_dev = input_allocate_device();
-	if (haptics->input_dev == NULL) {
+	haptics->input_dev = devm_input_allocate_device(&pdev->dev);
+	if (!haptics->input_dev) {
 		dev_err(arizona->dev, "Failed to allocate input device\n");
 		return -ENOMEM;
 	}

@@ -188,41 +188,23 @@ static int arizona_haptics_probe(struct platform_device *pdev)
 	if (ret < 0) {
 		dev_err(arizona->dev, "input_ff_create_memless() failed: %d\n",
 			ret);
-		goto err_ialloc;
+		return ret;
 	}
 
 	ret = input_register_device(haptics->input_dev);
 	if (ret < 0) {
 		dev_err(arizona->dev, "couldn't register input device: %d\n",
 			ret);
-		goto err_iff;
+		return ret;
 	}
 
 	platform_set_drvdata(pdev, haptics);
 
 	return 0;
-
-err_iff:
-	if (haptics->input_dev)
-		input_ff_destroy(haptics->input_dev);
-err_ialloc:
-	input_free_device(haptics->input_dev);
-
-	return ret;
-}
-
-static int arizona_haptics_remove(struct platform_device *pdev)
-{
-	struct arizona_haptics *haptics = platform_get_drvdata(pdev);
-
-	input_unregister_device(haptics->input_dev);
-
-	return 0;
 }
 
 static struct platform_driver arizona_haptics_driver = {
 	.probe		= arizona_haptics_probe,
-	.remove		= arizona_haptics_remove,
 	.driver		= {
 		.name	= "arizona-haptics",
 	},

Quoted 8 lines · Dmitry Torokhov

Quoted 4 lines · Joshua Clayton

Hi,
It seems to me that swapping error for ret buries the functional changes in the patch...
would it be better to split them into a second cleanup patch?

Fair enough, although I am not sure if I ever get to the renaming again

Joshua, does the below look OK to you?

Thanks!

Quoted 72 lines

Thanks.

Signature · 14 lines

Dmitry


Input: arizona-haptic - convert to use managed input devices

From: Dmitry Torokhov <[email protected]>

Using managed input device (via devm_input_allocate_device) simplifies
error handling and driver removal paths and also silences CID# 712569.

Signed-off-by: Dmitry Torokhov <[email protected]>
---
 drivers/input/misc/arizona-haptics.c |   26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

drivers/input/misc/arizona-haptics.c +4 -21

index 4dbbed7..4bf6785 100644
@@ -170,8 +170,8 @@ static int arizona_haptics_probe(struct platform_device *pdev)
 
      INIT_WORK(&haptics->work, arizona_haptics_work);
 
-     haptics->input_dev = input_allocate_device();
-     if (haptics->input_dev == NULL) {
+     haptics->input_dev = devm_input_allocate_device(&pdev->dev);
+     if (!haptics->input_dev) {
              dev_err(arizona->dev, "Failed to allocate input device\n");
              return -ENOMEM;
      }

@@ -188,41 +188,23 @@ static int arizona_haptics_probe(struct platform_device *pdev)
      if (ret < 0) {
              dev_err(arizona->dev, "input_ff_create_memless() failed: %d\n",
                      ret);
-             goto err_ialloc;
+             return ret;
      }
 
      ret = input_register_device(haptics->input_dev);
      if (ret < 0) {
              dev_err(arizona->dev, "couldn't register input device: %d\n",
                      ret);
-             goto err_iff;
+             return ret;
      }
 
      platform_set_drvdata(pdev, haptics);
 
      return 0;
-
-err_iff:
-     if (haptics->input_dev)
-             input_ff_destroy(haptics->input_dev);
-err_ialloc:
-     input_free_device(haptics->input_dev);
-
-     return ret;
-}
-
-static int arizona_haptics_remove(struct platform_device *pdev)
-{
-     struct arizona_haptics *haptics = platform_get_drvdata(pdev);
-
-     input_unregister_device(haptics->input_dev);
-
-     return 0;
 }
 

Quoted 6 lines

drivers/input/misc/arizona-haptics.c +0 -1

 static struct platform_driver arizona_haptics_driver = {
      .probe          = arizona_haptics_probe,
-     .remove         = arizona_haptics_remove,
      .driver         = {
              .name   = "arizona-haptics",
      },

Signature · 1 line

Dmitry