Do not call EC programmer shutdown functions explicitly.

mec1308.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 289 matching lines @@
                 msg_perr("%s(): failed to enter passthru mode, result=%02x\n",
                          __func__, tmp8);
                 return 1;
         }
         msg_pdbg("%s(): start passthru mode return code: 0x%02x\n",
                  __func__, tmp8);
 
         return 0;
 }
 
+static void mec1308_shutdown(void *data)
+{
+        if (spi_controller != SPI_CONTROLLER_MEC1308)
+                return;
+
+        /* Exit passthru mode before performing commands which do not affect
+           the SPI ROM */
+        mec1308_exit_passthru_mode();
+
+        /* Re-enable SMI and ACPI.
+           FIXME: is there an ordering dependency? */
+        mbx_write(MEC1308_MBX_CMD, MEC1308_CMD_SMI_ENABLE);
+        mbx_write(MEC1308_MBX_CMD, MEC1308_CMD_ACPI_ENABLE);
+}
+
 /* Called by internal_init() */
 int mec1308_probe_spi_flash(const char *name)
 {
         uint16_t sio_port;
         uint8_t device_id;
         uint8_t tmp8;
 
         msg_pdbg("%s(): entered\n", __func__);
 
         if (mec1308_get_sio_index(&sio_port) < 0) {
@@ skipping 34 matching lines @@
         if (mbx_wait() != 0) {
                 msg_perr("%s: mailbox is not available\n", __func__);
                 return 1;
         }
 
         /* Further setup -- disable SMI and ACPI.
            FIXME: is there an ordering dependency? */
         mbx_write(MEC1308_MBX_CMD, MEC1308_CMD_ACPI_DISABLE);
         mbx_write(MEC1308_MBX_CMD, MEC1308_CMD_SMI_DISABLE);
 
+        if (register_shutdown(mec1308_shutdown, NULL))
+                return 1;
+
         /*
          * Enter SPI Pass-Thru Mode after commands which do not require access
          * to SPI ROM are complete. We'll start by doing the exit_passthru_mode
          * sequence, which is benign if the EC is already in passthru mode.
          */
         mec1308_exit_passthru_mode();
+
         if (enter_passthru_mode())
                 return 1;
 
         msg_pdbg("%s(): successfully initialized mec1308\n", __func__);
         return 0;
 }
 
-int mec1308_shutdown(void)
-{
-        if (spi_controller != SPI_CONTROLLER_MEC1308)
-                return 0;
-
-        /* Exit passthru mode before performing commands which do not affect
-           the SPI ROM */
-        mec1308_exit_passthru_mode();
-
-        /* Re-enable SMI and ACPI.
-           FIXME: is there an ordering dependency? */
-        mbx_write(MEC1308_MBX_CMD, MEC1308_CMD_SMI_ENABLE);
-        mbx_write(MEC1308_MBX_CMD, MEC1308_CMD_ACPI_ENABLE);
-
-        return 0;
-}
-
 int mec1308_spi_read(struct flashchip *flash, uint8_t * buf, int start, int len)
 {
         return spi_read_chunked(flash, buf, start, len, flash->page_size);
 }
 
 int mec1308_spi_write_256(struct flashchip *flash,
                           uint8_t *buf, int start, int len)
 {
         return spi_write_chunked(flash, buf, start, len, flash->page_size);
 }
@@ skipping 32 matching lines @@
                 mbx_write(MEC1308_MBX_CMD, MEC1308_CMD_PASSTHRU_READ);
                 readarr[i] = mbx_read(MEC1308_MBX_DATA_START);
         }
 
         if (mec1308_chip_deselect())
                 return 1;
 
         return 0;
 }
 #endif