[1/2] drm/tegra: Use common error handling code in tegra_output_probe()

Message ID f9cc525e-7367-f4d8-d41f-dd35ce9a2c34@users.sourceforge.net
State New
Headers show
Series
  • GPU-DRM-Tegra: Fine-tuning for tegra_output_probe()
Related show

Commit Message

SF Markus Elfring Oct. 24, 2017, 5:34 p.m.
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 24 Oct 2017 19:12:09 +0200

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/gpu/drm/tegra/output.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Patch

diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
index 595d1ec3e02e..1e0915e213b4 100644
--- a/drivers/gpu/drm/tegra/output.c
+++ b/drivers/gpu/drm/tegra/output.c
@@ -139,8 +139,7 @@  int tegra_output_probe(struct tegra_output *output)
 		err = gpio_to_irq(output->hpd_gpio);
 		if (err < 0) {
 			dev_err(output->dev, "gpio_to_irq(): %d\n", err);
-			gpio_free(output->hpd_gpio);
-			return err;
+			goto free_gpio;
 		}
 
 		output->hpd_irq = err;
@@ -153,8 +152,7 @@  int tegra_output_probe(struct tegra_output *output)
 		if (err < 0) {
 			dev_err(output->dev, "failed to request IRQ#%u: %d\n",
 				output->hpd_irq, err);
-			gpio_free(output->hpd_gpio);
-			return err;
+			goto free_gpio;
 		}
 
 		output->connector.polled = DRM_CONNECTOR_POLL_HPD;
@@ -168,6 +166,10 @@  int tegra_output_probe(struct tegra_output *output)
 	}
 
 	return 0;
+
+free_gpio:
+	gpio_free(output->hpd_gpio);
+	return err;
 }
 
 void tegra_output_remove(struct tegra_output *output)