From: Jani Nikula <ext-jani.1.nikula@nokia.com> To: Tomi.Valkeinen@nokia.com, tony@atomide.com Cc: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, ext-jani.1.nikula@nokia.com Subject: [PATCH v3 13/21] OMAP: DSS2: Taal: Change probe error handling labels Date: Wed, 05 May 2010 14:27:33 +0000 [thread overview] Message-ID: <a4e7d90e0f036e227a29d94e28b7036c2f9d419b.1273067195.git.ext-jani.1.nikula@nokia.com> (raw) In-Reply-To: <8665676eca5bbd3be35b63f7110f629e94a6babe.1273067195.git.ext-jani.1.nikula@nokia.com> From: Jani Nikula <ext-jani.1.nikula@nokia.com> 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> --- drivers/video/omap2/displays/panel-taal.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index fa4c67b..e32424c 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; } -- 1.6.5.2
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <ext-jani.1.nikula@nokia.com> To: Tomi.Valkeinen@nokia.com, tony@atomide.com Cc: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, ext-jani.1.nikula@nokia.com Subject: [PATCH v3 13/21] OMAP: DSS2: Taal: Change probe error handling labels Date: Wed, 5 May 2010 17:27:33 +0300 [thread overview] Message-ID: <a4e7d90e0f036e227a29d94e28b7036c2f9d419b.1273067195.git.ext-jani.1.nikula@nokia.com> (raw) In-Reply-To: <8665676eca5bbd3be35b63f7110f629e94a6babe.1273067195.git.ext-jani.1.nikula@nokia.com> In-Reply-To: <cover.1273067195.git.ext-jani.1.nikula@nokia.com> From: Jani Nikula <ext-jani.1.nikula@nokia.com> 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> --- drivers/video/omap2/displays/panel-taal.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index fa4c67b..e32424c 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; } -- 1.6.5.2
next prev parent reply other threads:[~2010-05-05 14:27 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-05-05 14:27 [PATCH v3 00/21] OMAP: DSS2: Taal panel driver updates Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 01/21] OMAP: DSS2: Taal: Add panel hardware reset Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 02/21] OMAP: DSS2: Taal: add locks to taal_bl_update_status Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 03/21] OMAP: DSS2: Taal: Add locks to protect taal data access Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 04/21] OMAP: DSS2: Taal: Cosmetic improvement to backlight properties initialization Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 05/21] OMAP: DSS2: Taal: Remove platform enable/disable Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 06/21] OMAP: DSS2: Taal: Fix request_irq() error handling Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 07/21] OMAP: DSS2: Taal: Remove ESD work cancel from driver probe " Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 08/21] OMAP: DSS2: Taal: Improve taal_power_on() " Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 09/21] OMAP: DSS2: Taal: Ensure panel is enabled in enable_te() and run_test() Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 10/21] OMAP: DSS2: Taal: Change DSI bus locking to avoid deadlock in ESD work Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 11/21] OMAP: DSS2: Taal: Check taal_power_on() return value in taal_resume() Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 12/21] OMAP: DSS2: Taal: Change ESD work management Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` Jani Nikula [this message] 2010-05-05 14:27 ` [PATCH v3 13/21] OMAP: DSS2: Taal: Change probe error handling labels Jani Nikula 2010-05-05 14:27 ` [PATCH v3 14/21] OMAP: DSS2: Taal: Add proper external TE support Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 15/21] OMAP: DSS2: Add Nokia DSI command mode panel configuration struct Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 16/21] OMAP: DSS2: Taal: Use Nokia DSI panel data Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 17/21] OMAP: DSS2: Taal: Configure ESD check in " Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 18/21] OMAP: DSS2: Taal: Add panel specific configuration structure Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 19/21] OMAP: DSS2: Taal: Print panel name in addition to revision Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 20/21] OMAP: DSS2: Taal: Add regulator configuration support Jani Nikula 2010-05-05 14:27 ` Jani Nikula 2010-05-05 14:27 ` [PATCH v3 21/21] OMAP: DSS2: Taal: CABC workaround is Taal specific Jani Nikula 2010-05-05 14:27 ` Jani Nikula
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=a4e7d90e0f036e227a29d94e28b7036c2f9d419b.1273067195.git.ext-jani.1.nikula@nokia.com \ --to=ext-jani.1.nikula@nokia.com \ --cc=Tomi.Valkeinen@nokia.com \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.