diff mbox

[PATCHv2,1/3] Input: edt_ft5x06: use devm_* functions where appropriate

Message ID 1389859338-11685-2-git-send-email-LW@KARO-electronics.de (mailing list archive)
State New, archived
Headers show

Commit Message

Lothar Waßmann Jan. 16, 2014, 8:02 a.m. UTC 
Simplify the error path and remove() function by using devm_*
functions for requesting gpios and irq and allocating the input
device.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
---
 drivers/input/touchscreen/edt-ft5x06.c |   62 ++++++++++---------------------
 1 files changed, 20 insertions(+), 42 deletions(-)

Comments

Dmitry Torokhov Jan. 17, 2014, 12:28 a.m. UTC | #1 
On Thu, Jan 16, 2014 at 09:02:16AM +0100, Lothar Waßmann wrote:
> Simplify the error path and remove() function by using devm_*
> functions for requesting gpios and irq and allocating the input
> device.
> 
> Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

Applied, thank you.

> ---
>  drivers/input/touchscreen/edt-ft5x06.c |   62 ++++++++++---------------------
>  1 files changed, 20 insertions(+), 42 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
> index af0d68b..acb6b9f 100644
> --- a/drivers/input/touchscreen/edt-ft5x06.c
> +++ b/drivers/input/touchscreen/edt-ft5x06.c
> @@ -623,8 +623,9 @@ static int edt_ft5x06_ts_reset(struct i2c_client *client,
>  
>  	if (gpio_is_valid(reset_pin)) {
>  		/* this pulls reset down, enabling the low active reset */
> -		error = gpio_request_one(reset_pin, GPIOF_OUT_INIT_LOW,
> -					 "edt-ft5x06 reset");
> +		error = devm_gpio_request_one(&client->dev, reset_pin,
> +					GPIOF_OUT_INIT_LOW,
> +					"edt-ft5x06 reset");
>  		if (error) {
>  			dev_err(&client->dev,
>  				"Failed to request GPIO %d as reset pin, error %d\n",
> @@ -723,7 +724,7 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
>  		return error;
>  
>  	if (gpio_is_valid(pdata->irq_pin)) {
> -		error = gpio_request_one(pdata->irq_pin,
> +		error = devm_gpio_request_one(&client->dev, pdata->irq_pin,
>  					 GPIOF_IN, "edt-ft5x06 irq");
>  		if (error) {
>  			dev_err(&client->dev,
> @@ -734,11 +735,10 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
>  	}
>  
>  	tsdata = kzalloc(sizeof(*tsdata), GFP_KERNEL);
> -	input = input_allocate_device();
> -	if (!tsdata || !input) {
> -		dev_err(&client->dev, "failed to allocate driver data.\n");
> -		error = -ENOMEM;
> -		goto err_free_mem;
> +	input = devm_input_allocate_device(&client->dev);
> +	if (!input) {
> +		dev_err(&client->dev, "failed to allocate input device.\n");
> +		return -ENOMEM;
>  	}
>  
>  	mutex_init(&tsdata->mutex);
> @@ -749,7 +749,7 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
>  	error = edt_ft5x06_ts_identify(client, tsdata->name, fw_version);
>  	if (error) {
>  		dev_err(&client->dev, "touchscreen probe failed\n");
> -		goto err_free_mem;
> +		return error;
>  	}
>  
>  	edt_ft5x06_ts_get_defaults(tsdata, pdata);
> @@ -776,27 +776,30 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
>  	error = input_mt_init_slots(input, MAX_SUPPORT_POINTS, 0);
>  	if (error) {
>  		dev_err(&client->dev, "Unable to init MT slots.\n");
> -		goto err_free_mem;
> +		return error;
>  	}
>  
>  	input_set_drvdata(input, tsdata);
>  	i2c_set_clientdata(client, tsdata);
>  
> -	error = request_threaded_irq(client->irq, NULL, edt_ft5x06_ts_isr,
> -				     IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
> -				     client->name, tsdata);
> +	error = devm_request_threaded_irq(&client->dev, client->irq, NULL,
> +					edt_ft5x06_ts_isr,
> +					IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
> +					client->name, tsdata);
>  	if (error) {
>  		dev_err(&client->dev, "Unable to request touchscreen IRQ.\n");
> -		goto err_free_mem;
> +		return error;
>  	}
>  
>  	error = sysfs_create_group(&client->dev.kobj, &edt_ft5x06_attr_group);
>  	if (error)
> -		goto err_free_irq;
> +		return error;
>  
>  	error = input_register_device(input);
> -	if (error)
> -		goto err_remove_attrs;
> +	if (error) {
> +		sysfs_remove_group(&client->dev.kobj, &edt_ft5x06_attr_group);
> +		return error;
> +	}
>  
>  	edt_ft5x06_ts_prepare_debugfs(tsdata, dev_driver_string(&client->dev));
>  	device_init_wakeup(&client->dev, 1);
> @@ -806,40 +809,15 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
>  		pdata->irq_pin, pdata->reset_pin);
>  
>  	return 0;
> -
> -err_remove_attrs:
> -	sysfs_remove_group(&client->dev.kobj, &edt_ft5x06_attr_group);
> -err_free_irq:
> -	free_irq(client->irq, tsdata);
> -err_free_mem:
> -	input_free_device(input);
> -	kfree(tsdata);
> -
> -	if (gpio_is_valid(pdata->irq_pin))
> -		gpio_free(pdata->irq_pin);
> -
> -	return error;
>  }
>  
>  static int edt_ft5x06_ts_remove(struct i2c_client *client)
>  {
> -	const struct edt_ft5x06_platform_data *pdata =
> -						dev_get_platdata(&client->dev);
>  	struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client);
>  
>  	edt_ft5x06_ts_teardown_debugfs(tsdata);
>  	sysfs_remove_group(&client->dev.kobj, &edt_ft5x06_attr_group);
>  
> -	free_irq(client->irq, tsdata);
> -	input_unregister_device(tsdata->input);
> -
> -	if (gpio_is_valid(pdata->irq_pin))
> -		gpio_free(pdata->irq_pin);
> -	if (gpio_is_valid(pdata->reset_pin))
> -		gpio_free(pdata->reset_pin);
> -
> -	kfree(tsdata);
> -
>  	return 0;
>  }
>  
> -- 
> 1.7.2.5
>
diff mbox

Patch

diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index af0d68b..acb6b9f 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -623,8 +623,9 @@  static int edt_ft5x06_ts_reset(struct i2c_client *client,
 
 	if (gpio_is_valid(reset_pin)) {
 		/* this pulls reset down, enabling the low active reset */
-		error = gpio_request_one(reset_pin, GPIOF_OUT_INIT_LOW,
-					 "edt-ft5x06 reset");
+		error = devm_gpio_request_one(&client->dev, reset_pin,
+					GPIOF_OUT_INIT_LOW,
+					"edt-ft5x06 reset");
 		if (error) {
 			dev_err(&client->dev,
 				"Failed to request GPIO %d as reset pin, error %d\n",
@@ -723,7 +724,7 @@  static int edt_ft5x06_ts_probe(struct i2c_client *client,
 		return error;
 
 	if (gpio_is_valid(pdata->irq_pin)) {
-		error = gpio_request_one(pdata->irq_pin,
+		error = devm_gpio_request_one(&client->dev, pdata->irq_pin,
 					 GPIOF_IN, "edt-ft5x06 irq");
 		if (error) {
 			dev_err(&client->dev,
@@ -734,11 +735,10 @@  static int edt_ft5x06_ts_probe(struct i2c_client *client,
 	}
 
 	tsdata = kzalloc(sizeof(*tsdata), GFP_KERNEL);
-	input = input_allocate_device();
-	if (!tsdata || !input) {
-		dev_err(&client->dev, "failed to allocate driver data.\n");
-		error = -ENOMEM;
-		goto err_free_mem;
+	input = devm_input_allocate_device(&client->dev);
+	if (!input) {
+		dev_err(&client->dev, "failed to allocate input device.\n");
+		return -ENOMEM;
 	}
 
 	mutex_init(&tsdata->mutex);
@@ -749,7 +749,7 @@  static int edt_ft5x06_ts_probe(struct i2c_client *client,
 	error = edt_ft5x06_ts_identify(client, tsdata->name, fw_version);
 	if (error) {
 		dev_err(&client->dev, "touchscreen probe failed\n");
-		goto err_free_mem;
+		return error;
 	}
 
 	edt_ft5x06_ts_get_defaults(tsdata, pdata);
@@ -776,27 +776,30 @@  static int edt_ft5x06_ts_probe(struct i2c_client *client,
 	error = input_mt_init_slots(input, MAX_SUPPORT_POINTS, 0);
 	if (error) {
 		dev_err(&client->dev, "Unable to init MT slots.\n");
-		goto err_free_mem;
+		return error;
 	}
 
 	input_set_drvdata(input, tsdata);
 	i2c_set_clientdata(client, tsdata);
 
-	error = request_threaded_irq(client->irq, NULL, edt_ft5x06_ts_isr,
-				     IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-				     client->name, tsdata);
+	error = devm_request_threaded_irq(&client->dev, client->irq, NULL,
+					edt_ft5x06_ts_isr,
+					IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+					client->name, tsdata);
 	if (error) {
 		dev_err(&client->dev, "Unable to request touchscreen IRQ.\n");
-		goto err_free_mem;
+		return error;
 	}
 
 	error = sysfs_create_group(&client->dev.kobj, &edt_ft5x06_attr_group);
 	if (error)
-		goto err_free_irq;
+		return error;
 
 	error = input_register_device(input);
-	if (error)
-		goto err_remove_attrs;
+	if (error) {
+		sysfs_remove_group(&client->dev.kobj, &edt_ft5x06_attr_group);
+		return error;
+	}
 
 	edt_ft5x06_ts_prepare_debugfs(tsdata, dev_driver_string(&client->dev));
 	device_init_wakeup(&client->dev, 1);
@@ -806,40 +809,15 @@  static int edt_ft5x06_ts_probe(struct i2c_client *client,
 		pdata->irq_pin, pdata->reset_pin);
 
 	return 0;
-
-err_remove_attrs:
-	sysfs_remove_group(&client->dev.kobj, &edt_ft5x06_attr_group);
-err_free_irq:
-	free_irq(client->irq, tsdata);
-err_free_mem:
-	input_free_device(input);
-	kfree(tsdata);
-
-	if (gpio_is_valid(pdata->irq_pin))
-		gpio_free(pdata->irq_pin);
-
-	return error;
 }
 
 static int edt_ft5x06_ts_remove(struct i2c_client *client)
 {
-	const struct edt_ft5x06_platform_data *pdata =
-						dev_get_platdata(&client->dev);
 	struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client);
 
 	edt_ft5x06_ts_teardown_debugfs(tsdata);
 	sysfs_remove_group(&client->dev.kobj, &edt_ft5x06_attr_group);
 
-	free_irq(client->irq, tsdata);
-	input_unregister_device(tsdata->input);
-
-	if (gpio_is_valid(pdata->irq_pin))
-		gpio_free(pdata->irq_pin);
-	if (gpio_is_valid(pdata->reset_pin))
-		gpio_free(pdata->reset_pin);
-
-	kfree(tsdata);
-
 	return 0;
 }