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

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

drivers/mtd/nand/raw/nandsim.c

+6 −13
Original line number Diff line number Diff line
@@ -1731,14 +1731,6 @@ static void ns_switch_state(struct nandsim *ns) 
			"state: %s, nxstate: %s\n",

		       ns_get_state_name(ns->state),

		       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 {

		/*

		 * We don't yet know which operation we perform.
@@ -1755,13 +1747,14 @@ static void ns_switch_state(struct nandsim *ns) 


		if (ns_find_operation(ns, 0))

			return;

	}



	/* 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;

	}

	}



	/* For 16x devices column means the page offset in words */

	if ((ns->nxstate & STATE_ADDR_MASK) && ns->busw == 16) {