Use consistent naming for local chip ID variables

Every chip besides SPI and w39v080fa uses id1/id2 as local variable
names to store ID responses from the flash chip. This eases grepping a
lot. As a bonus, it also frees up some names to be used as parameters.

Corresponding to flashrom svn r551.

Signed-off-by: Carl-Daniel Hailfinger <>
Acked-by: Patrick Georgi <>
2 files changed