The following two patches include the new states in enum test_state and change the previous .tested field in struct flashchip to a sub-struct containing 4 enum test_state (one for each operation).
Both are semantically the same. The difference is that one renames the .tested field of the struct to .state which helped a lot during development of the patch, while the other one does simply replace the old semantics of .tested without renaming it. The patch w/o the rename is easier to read and much smaller, but it might be useful to change the field and associated macros nevertheless to have a clear indication of the change and to clearly distinguish patches following the old style from newer ones.