[PATCH 2/3] backlight: aat2870: remove goto out

[PATCH 2/3] backlight: aat2870: remove goto out

[Jingoo Han]

This patch removes goto out, which makes code a bit smaller.

Cc: Jin Park <jinyoungp@nvidia.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/video/backlight/aat2870_bl.c |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/video/backlight/aat2870_bl.c b/drivers/video/backlight/aat2870_bl.c
index 7ff7522..619a1e0 100644
--- a/drivers/video/backlight/aat2870_bl.c
+++ b/drivers/video/backlight/aat2870_bl.c
@@ -135,14 +135,12 @@ static int aat2870_bl_probe(struct platform_device *pdev)
 
 	if (!pdata) {
 		dev_err(&pdev->dev, "No platform data\n");
-		ret = -ENXIO;
-		goto out;
+		return -ENXIO;
 	}
 
 	if (pdev->id != AAT2870_ID_BL) {
 		dev_err(&pdev->dev, "Invalid device ID, %d\n", pdev->id);
-		ret = -EINVAL;
-		goto out;
+		return -EINVAL;
 	}
 
 	aat2870_bl = devm_kzalloc(&pdev->dev,
@@ -151,8 +149,7 @@ static int aat2870_bl_probe(struct platform_device *pdev)
 	if (!aat2870_bl) {
 		dev_err(&pdev->dev,
 			"Failed to allocate memory for aat2870 backlight\n");
-		ret = -ENOMEM;
-		goto out;
+		return -ENOMEM;
 	}
 
 	memset(&props, 0, sizeof(struct backlight_properties));
@@ -163,8 +160,7 @@ static int aat2870_bl_probe(struct platform_device *pdev)
 	if (IS_ERR(bd)) {
 		dev_err(&pdev->dev,
 			"Failed allocate memory for backlight device\n");
-		ret = PTR_ERR(bd);
-		goto out;
+		return PTR_ERR(bd);
 	}
 
 	aat2870_bl->pdev = pdev;
@@ -201,7 +197,6 @@ static int aat2870_bl_probe(struct platform_device *pdev)
 
 out_bl_dev_unregister:
 	backlight_device_unregister(bd);
-out:
 	return ret;
 }
 
-- 
1.7.1

Re: [PATCH 2/3] backlight: aat2870: remove goto out

[jinyoungp]

Re-send.

Acked-by: Jinyoung Park <jinyoungp@nvidia.com>

Thanks,
Jinyoung.

On 08/06/2012 06:32 PM, Jingoo Han wrote:
> This patch removes goto out, which makes code a bit smaller.
>
> Cc: Jin Park <jinyoungp@nvidia.com>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
>   drivers/video/backlight/aat2870_bl.c |   13 ++++---------
>   1 files changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/video/backlight/aat2870_bl.c b/drivers/video/backlight/aat2870_bl.c
> index 7ff7522..619a1e0 100644
> --- a/drivers/video/backlight/aat2870_bl.c
> +++ b/drivers/video/backlight/aat2870_bl.c
> @@ -135,14 +135,12 @@ static int aat2870_bl_probe(struct platform_device *pdev)
>
>   	if (!pdata) {
>   		dev_err(&pdev->dev, "No platform data\n");
> -		ret = -ENXIO;
> -		goto out;
> +		return -ENXIO;
>   	}
>
>   	if (pdev->id != AAT2870_ID_BL) {
>   		dev_err(&pdev->dev, "Invalid device ID, %d\n", pdev->id);
> -		ret = -EINVAL;
> -		goto out;
> +		return -EINVAL;
>   	}
>
>   	aat2870_bl = devm_kzalloc(&pdev->dev,
> @@ -151,8 +149,7 @@ static int aat2870_bl_probe(struct platform_device *pdev)
>   	if (!aat2870_bl) {
>   		dev_err(&pdev->dev,
>   			"Failed to allocate memory for aat2870 backlight\n");
> -		ret = -ENOMEM;
> -		goto out;
> +		return -ENOMEM;
>   	}
>
>   	memset(&props, 0, sizeof(struct backlight_properties));
> @@ -163,8 +160,7 @@ static int aat2870_bl_probe(struct platform_device *pdev)
>   	if (IS_ERR(bd)) {
>   		dev_err(&pdev->dev,
>   			"Failed allocate memory for backlight device\n");
> -		ret = PTR_ERR(bd);
> -		goto out;
> +		return PTR_ERR(bd);
>   	}
>
>   	aat2870_bl->pdev = pdev;
> @@ -201,7 +197,6 @@ static int aat2870_bl_probe(struct platform_device *pdev)
>
>   out_bl_dev_unregister:
>   	backlight_device_unregister(bd);
> -out:
>   	return ret;
>   }
>
>