Do not call EC programmer shutdown functions explicitly.

wpce775x.c

 /*
  * This file is part of the flashrom project.
  *
  * Copyright (C) 2010 Google, Inc.
  *
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
  * are met:
  * 
  * Redistributions of source code must retain the above copyright 
@@ skipping 522 matching lines @@
  * 0x21 is used for EC F/W changed. Goto EC F/W, wait system reboot.
  * 0x22 is used for EC F/W changed, Goto EC Watchdog reset. */
 int ExitFlashUpdateFirmwareNoChange(void) {
         return ExitFlashUpdate(0x20);
 }
 
 int ExitFlashUpdateFirmwareChanged(void) {
         return ExitFlashUpdate(0x21);
 }
 
+static void wpce775x_shutdown(void *data)
+{
+        if (spi_controller != SPI_CONTROLLER_WPCE775X)
+                return;
+
+        msg_pdbg("%s(): firmware %s\n", __func__,
+                 firmware_changed ? "changed" : "not changed");
+
+        msg_pdbg("%s: in_flash_update_mode: %d\n", __func__, in_flash_update_mode);
+        if (in_flash_update_mode) {
+                if (firmware_changed)
+                        ExitFlashUpdateFirmwareChanged();
+                else
+                        ExitFlashUpdateFirmwareNoChange();
+
+                in_flash_update_mode = 0;
+        }
+
+        if (initflash_cfg)
+                free(initflash_cfg);
+        else
+                msg_perr("%s(): No initflash_cfg to free?!?\n", __func__);
+}
+
 int wpce775x_spi_common_init(void)
 {
         uint16_t sio_port;
         uint8_t srid;
         uint8_t fwh_id;
 
         msg_pdbg("%s(): entered\n", __func__);
 
         /* detect if wpce775x exists */
         if (nuvoton_get_sio_index(&sio_port) < 0) {
@@ skipping 32 matching lines @@
 
         if (get_fwh_id(&fwh_id) < 0) {
                 msg_pdbg("Cannot get fwh_id value.\n");
                 return 0;
         }
         msg_pdbg("get fwh_id: 0x%02x\n", fwh_id);
 
         /* TODO: set fwh_idsel of chipset.
                  Currently, we employ "-p internal:fwh_idsel=0x0000223e". */
 
+        if (register_shutdown(wpce775x_shutdown, NULL))
+                return 1;
+
         /* Enter flash update mode unconditionally. This is required even
            for reading. */
         if (EnterFlashUpdate()) return 1;
 
         spi_controller = SPI_CONTROLLER_WPCE775X;
         msg_pdbg("%s(): successfully initialized wpce775x\n", __func__);
         return 0;
-
-}
-
-int wpce775x_shutdown(void)
-{
-        if (spi_controller != SPI_CONTROLLER_WPCE775X)
-                return 0;
-
-        msg_pdbg("%s(): firmware %s\n", __func__,
-                 firmware_changed ? "changed" : "not changed");
-
-        msg_pdbg("%s: in_flash_update_mode: %d\n", __func__, in_flash_update_mode);
-        if (in_flash_update_mode) {
-                if (firmware_changed)
-                        ExitFlashUpdateFirmwareChanged();
-                else
-                        ExitFlashUpdateFirmwareNoChange();
-
-                in_flash_update_mode = 0;
-        }
-
-        if (initflash_cfg)
-                free(initflash_cfg);
-        else
-                msg_perr("%s(): No initflash_cfg to free?!?\n", __func__);
-
-        return 0;
 }
 
 /* Called by internal_init() */
 int wpce775x_probe_spi_flash(const char *name)
 {
         int ret;
 
         if (!(buses_supported & CHIP_BUSTYPE_FWH)) {
                 msg_pdbg("%s():%d buses not support FWH\n", __func__, __LINE__);
                 return 1;
@@ skipping 337 matching lines @@
                 /* unsupported opcodes */
                 msg_pdbg("unsupported SPI opcode: %02x\n", opcode);
                 rc = 1;
                 break;
         }
 
         msg_pdbg("%s: opcode: 0x%02x\n", __func__, opcode);
         return rc;
 }
 #endif