UPSTREAM: flashrom.c: Use programmer_init() func params over global
The 'programmer' intended to be used in the control flow
of 'programmer_init()' is a parameter to the function. Therefore
use that symbol directly over the global copy of it.
(cherry picked from commit 890d07986b66aed4d216a02977d37bfb69cec034)
Original-Change-Id: I71e61f0633bac2fc472971249910bf3bf57cd0eb
Original-Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Original-Reviewed-on: https://review.coreboot.org/c/flashrom/+/68249
Original-Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
GitOrigin-RevId: 890d07986b66aed4d216a02977d37bfb69cec034
Change-Id: I20c85abcc68c8f38c4628b94f781500da8bb8d69
Signed-off-by: CopyBot <copybot.service@gmail.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+/3959954
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Tested-by: Evan Benn <evanbenn@chromium.org>
Reviewed-by: Evan Benn <evanbenn@chromium.org>
Commit-Queue: Edward O'Callaghan <quasisec@chromium.org>
diff --git a/flashrom.c b/flashrom.c
index e437daf..dc22618 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -165,8 +165,8 @@
cfg.params = NULL;
}
- msg_pdbg("Initializing %s programmer\n", programmer->name);
- ret = programmer->init(&cfg);
+ msg_pdbg("Initializing %s programmer\n", prog->name);
+ ret = prog->init(&cfg);
if (cfg.params && strlen(cfg.params)) {
if (ret != 0) {
/* It is quite possible that any unhandled programmer parameter would have been valid,
