Do not call EC programmer shutdown functions explicitly.

mec1308.c

Index: mec1308.c
diff --git a/mec1308.c b/mec1308.c
index c4db628d891ae93b21203d685bcff56a212ed81f..6cbdf204f40d53f07efe56d17c7a2b57c6c8c5cb 100644
--- a/mec1308.c
+++ b/mec1308.c
@@ -42,6 +42,8 @@
 #include "programmer.h"
 #include "spi.h"
 
+void mec1308_shutdown(void *);
+
 #define MEC1308_SIO_PORT1	0x2e
 #define MEC1308_SIO_PORT2	0x4e
 #define MEC1308_SIO_ENTRY_KEY	0x55
@@ -371,13 +373,14 @@ int mec1308_probe_spi_flash(const char *name)
 		return 1;
 
 	msg_pdbg("%s(): successfully initialized mec1308\n", __func__);

[Louis, 2011/04/26 10:06:06]

Swap this message to next line?  To sync the same behavior as wpce775.

[dhendrix, 2011/04/27 02:08:06]

On second thought, I think we should do these earlier so that we ensure the
shutdown callback is registered _before_ entering passthru mode. LMK what you
think.

+	register_shutdown(mec1308_shutdown, NULL);
 	return 0;
 }
 
-int mec1308_shutdown(void)
+void mec1308_shutdown(void *data)
 {
 	if (spi_controller != SPI_CONTROLLER_MEC1308)
-		return 0;
+		return;
 
 	/* Exit passthru mode before performing commands which do not affect
 	   the SPI ROM */
@@ -387,8 +390,6 @@ int mec1308_shutdown(void)
 	   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)