Commit e75ed3c4 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

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.

Reviewed-by: default avatarJoshua Clayton <stillcompiling@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent ce2ae9e3

drivers/input/misc/arizona-haptics.c

+4 −22
Original line number Diff line number Diff line
@@ -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;

	}



	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);

	platform_set_drvdata(pdev, haptics);



	return 0;

}



static struct platform_driver arizona_haptics_driver = {

	.probe		= arizona_haptics_probe,

	.remove		= arizona_haptics_remove,

	.driver		= {

		.name	= "arizona-haptics",

	},

CRA Git | Maintained and supported by SUSTech CRA and CCSE