media: staging/intel-ipu3: Simplify single goto jump
Subsystems (3)
PATCH v2 1/1 media: staging/intel-ipu3: Simplify single goto jump
On successful node setup, the code jumps to a cleanup label to perform nodes cleanup. This only call to cleanup using goto label can be included in the for / if blocks to make it look more associated.
Signed-off-by Deepak R Varma <[email protected]>
Reviewed-by Stefano Brivio <[email protected]>
---
Changes since v1:
- Corrected /reduced scope of variable r. Warning generated by Sakari's Kbuild bot. Change advised by Sakari Ailus.
- Patch was earlier reviewed by Stefano. The bot warning came in later.
drivers/staging/media/ipu3/ipu3-v4l2.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/staging/media/ipu3/ipu3-v4l2.c +7 -9
@@ -1291,19 +1291,17 @@ static void imgu_v4l2_nodes_cleanup_pipe(struct imgu_device *imgu,static int imgu_v4l2_nodes_setup_pipe (struct imgu_device *imgu,int pipe) { -int i, r; +int i;for (i =0 ; i <IMGU_NODE_NUM ; i++) { - r =imgu_v4l2_node_setup (imgu, pipe, i); -if (r) - goto cleanup; - } +int r =imgu_v4l2_node_setup (imgu, pipe, i); +if (r) { +imgu_v4l2_nodes_cleanup_pipe (imgu, pipe, i); +return r; + } + }return 0 ; - -cleanup: -imgu_v4l2_nodes_cleanup_pipe (imgu, pipe, i); -return r; }static void imgu_v4l2_subdev_cleanup (struct imgu_device *imgu,unsigned int i)
Signature · 1 line
2.17.1