[PATCH] staging: media: tegra-video: Use common error handling code in tegra_vi_graph_parse_one()

From: Markus Elfring
Date: Thu Feb 29 2024 - 13:56:41 EST


From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
Date: Thu, 29 Feb 2024 19:44:36 +0100

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

Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
---
drivers/staging/media/tegra-video/vi.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
index af6e3a0d8df4..5a08d9551f8b 100644
--- a/drivers/staging/media/tegra-video/vi.c
+++ b/drivers/staging/media/tegra-video/vi.c
@@ -1730,21 +1730,20 @@ static int tegra_vi_graph_parse_one(struct tegra_vi_channel *chan,
ret = PTR_ERR(tvge);
dev_err(vi->dev,
"failed to add subdev to notifier: %d\n", ret);
- fwnode_handle_put(remote);
- goto cleanup;
+ goto put_fwnode;
}

ret = tegra_vi_graph_parse_one(chan, remote);
- if (ret < 0) {
- fwnode_handle_put(remote);
- goto cleanup;
- }
+ if (ret < 0)
+ goto put_fwnode;

fwnode_handle_put(remote);
}

return 0;

+put_fwnode:
+ fwnode_handle_put(remote);
cleanup:
dev_err(vi->dev, "failed parsing the graph: %d\n", ret);
v4l2_async_nf_cleanup(&chan->notifier);
--
2.44.0