Commit db52b445 authored by RinHizakura's avatar RinHizakura Committed by Miquel Raynal

mtd: rawnand: nandsim: Merge repeat codes in ns_switch_state

The moving block of codes is shared between both 'if' and 'else' condition,
we can move it out to reduce the duplication.
Signed-off-by: default avatarRinHizakura <s921975628@gmail.com>
Reviewed-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20211225100648.119011-1-s921975628@gmail.com
parent e0a9ddd5
...@@ -1731,14 +1731,6 @@ static void ns_switch_state(struct nandsim *ns) ...@@ -1731,14 +1731,6 @@ static void ns_switch_state(struct nandsim *ns)
"state: %s, nxstate: %s\n", "state: %s, nxstate: %s\n",
ns_get_state_name(ns->state), ns_get_state_name(ns->state),
ns_get_state_name(ns->nxstate)); ns_get_state_name(ns->nxstate));
/* See, whether we need to do some action */
if ((ns->state & ACTION_MASK) &&
ns_do_state_action(ns, ns->state) < 0) {
ns_switch_to_ready_state(ns, NS_STATUS_FAILED(ns));
return;
}
} else { } else {
/* /*
* We don't yet know which operation we perform. * We don't yet know which operation we perform.
...@@ -1755,12 +1747,13 @@ static void ns_switch_state(struct nandsim *ns) ...@@ -1755,12 +1747,13 @@ static void ns_switch_state(struct nandsim *ns)
if (ns_find_operation(ns, 0)) if (ns_find_operation(ns, 0))
return; return;
}
if ((ns->state & ACTION_MASK) && /* See, whether we need to do some action */
ns_do_state_action(ns, ns->state) < 0) { if ((ns->state & ACTION_MASK) &&
ns_switch_to_ready_state(ns, NS_STATUS_FAILED(ns)); ns_do_state_action(ns, ns->state) < 0) {
return; ns_switch_to_ready_state(ns, NS_STATUS_FAILED(ns));
} return;
} }
/* For 16x devices column means the page offset in words */ /* For 16x devices column means the page offset in words */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment