diff mbox series

[-next] Input: da9034-ts - simplify the return expression of da9034_touch_probe()

Message ID 20200915032626.1772465-1-liushixin2@huawei.com
State New
Headers show
Series [-next] Input: da9034-ts - simplify the return expression of da9034_touch_probe() | expand

Commit Message

Liu Shixin Sept. 15, 2020, 3:26 a.m. UTC
Simplify the return expression.

Signed-off-by: Liu Shixin <liushixin2@huawei.com>
---
 drivers/input/touchscreen/da9034-ts.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Dmitry Torokhov Sept. 16, 2020, 4:07 a.m. UTC | #1
On Tue, Sep 15, 2020 at 11:26:26AM +0800, Liu Shixin wrote:
> Simplify the return expression.

> 

> Signed-off-by: Liu Shixin <liushixin2@huawei.com>

> ---

>  drivers/input/touchscreen/da9034-ts.c | 7 +------

>  1 file changed, 1 insertion(+), 6 deletions(-)

> 

> diff --git a/drivers/input/touchscreen/da9034-ts.c b/drivers/input/touchscreen/da9034-ts.c

> index 2943f6a58388..dfb2604381d2 100644

> --- a/drivers/input/touchscreen/da9034-ts.c

> +++ b/drivers/input/touchscreen/da9034-ts.c

> @@ -298,7 +298,6 @@ static int da9034_touch_probe(struct platform_device *pdev)

>  	struct da9034_touch_pdata *pdata = dev_get_platdata(&pdev->dev);

>  	struct da9034_touch *touch;

>  	struct input_dev *input_dev;

> -	int error;

>  

>  	touch = devm_kzalloc(&pdev->dev, sizeof(struct da9034_touch),

>  			     GFP_KERNEL);

> @@ -344,11 +343,7 @@ static int da9034_touch_probe(struct platform_device *pdev)

>  	touch->input_dev = input_dev;

>  	input_set_drvdata(input_dev, touch);

>  

> -	error = input_register_device(input_dev);

> -	if (error)

> -		return error;

> -

> -	return 0;

> +	return input_register_device(input_dev);


Thank you for the patch, but I prefer explicit returns on errors when
there are multiple failure points in a function, as that allows
extending the function more easily.

Thanks.

-- 
Dmitry
diff mbox series

Patch

diff --git a/drivers/input/touchscreen/da9034-ts.c b/drivers/input/touchscreen/da9034-ts.c
index 2943f6a58388..dfb2604381d2 100644
--- a/drivers/input/touchscreen/da9034-ts.c
+++ b/drivers/input/touchscreen/da9034-ts.c
@@ -298,7 +298,6 @@  static int da9034_touch_probe(struct platform_device *pdev)
 	struct da9034_touch_pdata *pdata = dev_get_platdata(&pdev->dev);
 	struct da9034_touch *touch;
 	struct input_dev *input_dev;
-	int error;
 
 	touch = devm_kzalloc(&pdev->dev, sizeof(struct da9034_touch),
 			     GFP_KERNEL);
@@ -344,11 +343,7 @@  static int da9034_touch_probe(struct platform_device *pdev)
 	touch->input_dev = input_dev;
 	input_set_drvdata(input_dev, touch);
 
-	error = input_register_device(input_dev);
-	if (error)
-		return error;
-
-	return 0;
+	return input_register_device(input_dev);
 }
 
 static struct platform_driver da9034_touch_driver = {