From: Jani Nikula <ext-jani.1.nikula@nokia.com>
Date: Thu, 15 Apr 2010 09:24:36 +0000 (+0300)
Subject: OMAP: DSS2: Taal: Change probe error handling labels
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d2b657873839fd401798ba277868fc8442997443;p=linux-beck.git

OMAP: DSS2: Taal: Change probe error handling labels

Switch from numbered to named labels to make it easier to add new
labels for error handling.

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
---

diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 383003ca092d..2f8967874680 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -539,7 +539,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
 	td = kzalloc(sizeof(*td), GFP_KERNEL);
 	if (!td) {
 		r = -ENOMEM;
-		goto err0;
+		goto err;
 	}
 	td->dssdev = dssdev;
 
@@ -549,7 +549,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
 	if (td->esd_wq == NULL) {
 		dev_err(&dssdev->dev, "can't create ESD workqueue\n");
 		r = -ENOMEM;
-		goto err1;
+		goto err_wq;
 	}
 	INIT_DELAYED_WORK_DEFERRABLE(&td->esd_work, taal_esd_work);
 
@@ -571,7 +571,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
 					  &taal_bl_ops, &props);
 	if (IS_ERR(bldev)) {
 		r = PTR_ERR(bldev);
-		goto err2;
+		goto err_bl;
 	}
 
 	td->bldev = bldev;
@@ -591,7 +591,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
 		r = gpio_request(gpio, "taal irq");
 		if (r) {
 			dev_err(&dssdev->dev, "GPIO request failed\n");
-			goto err3;
+			goto err_gpio;
 		}
 
 		gpio_direction_input(gpio);
@@ -603,7 +603,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
 		if (r) {
 			dev_err(&dssdev->dev, "IRQ request failed\n");
 			gpio_free(gpio);
-			goto err4;
+			goto err_irq;
 		}
 
 		init_completion(&td->te_completion);
@@ -614,23 +614,23 @@ static int taal_probe(struct omap_dss_device *dssdev)
 	r = sysfs_create_group(&dssdev->dev.kobj, &taal_attr_group);
 	if (r) {
 		dev_err(&dssdev->dev, "failed to create sysfs files\n");
-		goto err5;
+		goto err_sysfs;
 	}
 
 	return 0;
-err5:
+err_sysfs:
 	if (td->use_ext_te)
 		free_irq(gpio_to_irq(dssdev->phy.dsi.ext_te_gpio), dssdev);
-err4:
+err_irq:
 	if (td->use_ext_te)
 		gpio_free(dssdev->phy.dsi.ext_te_gpio);
-err3:
+err_gpio:
 	backlight_device_unregister(bldev);
-err2:
+err_bl:
 	destroy_workqueue(td->esd_wq);
-err1:
+err_wq:
 	kfree(td);
-err0:
+err:
 	return r;
 }