Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6de67de3 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Rob Herring
Browse files

of: overlay: Remove else after goto 



If an "if" branch is terminated by a "goto", there's no need to have an
"else" statement and an indented block of code.

Remove the "else" statement to simplify the code flow for the casual
reviewer.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent e9d92e40

drivers/of/overlay.c

+12 −15
Original line number Diff line number Diff line
@@ -580,9 +580,9 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs, 
				of_node_put(fragment->overlay);

				ret = -EINVAL;

				goto err_free_fragments;

			} else {

				cnt++;

			}



			cnt++;

		}

	}
@@ -736,13 +736,12 @@ int of_overlay_apply(struct device_node *tree, int *ovcs_id) 
			devicetree_state_flags |= DTSF_APPLY_FAIL;

		}

		goto err_free_overlay_changeset;

	} else {

	}



	ret = __of_changeset_apply_notify(&ovcs->cset);

	if (ret)

			pr_err("overlay changeset entry notify error %d\n",

			       ret);

		/* fall through */

	}

		pr_err("overlay changeset entry notify error %d\n", ret);

	/* notify failure is not fatal, continue */



	list_add_tail(&ovcs->ovcs_list, &ovcs_list);

	*ovcs_id = ovcs->id;
@@ -931,15 +930,13 @@ int of_overlay_remove(int *ovcs_id) 
		if (ret_apply)

			devicetree_state_flags |= DTSF_REVERT_FAIL;

		goto out_unlock;

	} else {

		ret = __of_changeset_revert_notify(&ovcs->cset);

		if (ret) {

			pr_err("overlay changeset entry notify error %d\n",

			       ret);

			/* fall through - changeset was reverted */

		}

	}



	ret = __of_changeset_revert_notify(&ovcs->cset);

	if (ret)

		pr_err("overlay changeset entry notify error %d\n", ret);

	/* notify failure is not fatal, continue */



	*ovcs_id = 0;



	ret_tmp = overlay_notify(ovcs, OF_OVERLAY_POST_REMOVE);