[coreboot-gerrit] New patch to review for coreboot: ae10363 Remove defines APMC_FINALIZE.

[Vladimir Serbinenko]

Vladimir Serbinenko ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10226

-gerrit

commit ae103639607ee3db971380e1992c2f27ef95d800
Author: Vladimir Serbinenko 
Date:   Sat May 16 13:33:49 2015 +0200

Remove defines APMC_FINALIZE.

We already have APM_CNT_FINALIZE defined to the same value. Just use it
    thoughout.

Change-Id: Ife94ec7a34da27d3a720bda7337c02e41f18ac72
    Signed-off-by: Vladimir Serbinenko 
---
 src/mainboard/google/bolt/smihandler.c             | 3 +--
 src/mainboard/google/butterfly/mainboard_smi.c     | 3 +--
 src/mainboard/google/falco/smihandler.c            | 3 +--
 src/mainboard/google/link/mainboard_smi.c          | 3 +--
 src/mainboard/google/panther/smihandler.c          | 3 +--
 src/mainboard/google/parrot/smihandler.c           | 3 +--
 src/mainboard/google/peppy/smihandler.c            | 3 +--
 src/mainboard/google/slippy/smihandler.c           | 3 +--
 src/mainboard/google/stout/mainboard_smi.c         | 3 +--
 src/mainboard/intel/baskingridge/mainboard_smi.c   | 3 +--
 src/mainboard/intel/cougar_canyon2/mainboard_smi.c | 3 +--
 src/mainboard/intel/emeraldlake2/smihandler.c      | 3 +--
 src/mainboard/kontron/ktqm77/smihandler.c          | 3 +--
 src/mainboard/samsung/lumpy/smihandler.c           | 3 +--
 src/mainboard/samsung/stumpy/smihandler.c          | 3 +--
 15 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/mainboard/google/bolt/smihandler.c b/src/mainboard/google/bolt/smihandler.c
index 54dcb73..7bc978e 100644
--- a/src/mainboard/google/bolt/smihandler.c
+++ b/src/mainboard/google/bolt/smihandler.c
@@ -144,14 +144,13 @@ void mainboard_smi_sleep(u8 slp_typ)
    google_chromeec_set_wake_mask(MAINBOARD_EC_S3_WAKE_EVENTS);
 }

-#define APMC_FINALIZE 0xcb

static int mainboard_finalized = 0;

int mainboard_smi_apmc(u8 apmc)
 {
    switch (apmc) {
-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "SMI#: Already finalized\n");
    		return 0;
diff --git a/src/mainboard/google/butterfly/mainboard_smi.c b/src/mainboard/google/butterfly/mainboard_smi.c
index a40e428..1876f31 100644
--- a/src/mainboard/google/butterfly/mainboard_smi.c
+++ b/src/mainboard/google/butterfly/mainboard_smi.c
@@ -73,7 +73,6 @@ void mainboard_smi_sleep(u8 slp_typ)
    }
 }

-#define APMC_FINALIZE 0xcb
 #define APMC_ACPI_EN  0xe1
 #define APMC_ACPI_DIS 0x1e

@@ -83,7 +82,7 @@ int mainboard_smi_apmc(u8 apmc)
 {
    printk(BIOS_DEBUG, "mainboard_smi_apmc: %x\n", apmc);
    switch (apmc) {
-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	printk(BIOS_DEBUG, "APMC: FINALIZE\n");
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "APMC#: Already finalized\n");
diff --git a/src/mainboard/google/falco/smihandler.c b/src/mainboard/google/falco/smihandler.c
index 511bfc5..e86787b 100644
--- a/src/mainboard/google/falco/smihandler.c
+++ b/src/mainboard/google/falco/smihandler.c
@@ -137,14 +137,13 @@ void mainboard_smi_sleep(u8 slp_typ)
    while (google_chromeec_get_event() != 0);
 }

-#define APMC_FINALIZE 0xcb

static int mainboard_finalized = 0;

int mainboard_smi_apmc(u8 apmc)
 {
    switch (apmc) {
-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "SMI#: Already finalized\n");
    		return 0;
diff --git a/src/mainboard/google/link/mainboard_smi.c b/src/mainboard/google/link/mainboard_smi.c
index 24fa8b5..d60d319 100644
--- a/src/mainboard/google/link/mainboard_smi.c
+++ b/src/mainboard/google/link/mainboard_smi.c
@@ -118,7 +118,6 @@ void mainboard_smi_sleep(u8 slp_typ)
    google_chromeec_set_wake_mask(LINK_EC_S3_WAKE_EVENTS);
 }

-#define APMC_FINALIZE 0xcb
 #define APMC_ACPI_EN  0xe1
 #define APMC_ACPI_DIS 0x1e

@@ -127,7 +126,7 @@ static int mainboard_finalized = 0;
 int mainboard_smi_apmc(u8 apmc)
 {
    switch (apmc) {
-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "SMI#: Already finalized\n");
    		return 0;
diff --git a/src/mainboard/google/panther/smihandler.c b/src/mainboard/google/panther/smihandler.c
index 3448648..a551b49 100644
--- a/src/mainboard/google/panther/smihandler.c
+++ b/src/mainboard/google/panther/smihandler.c
@@ -52,14 +52,13 @@ int mainboard_io_trap_handler(int smif)
    return 1;
 }

-#define APMC_FINALIZE 0xcb

static int mainboard_finalized = 0;

int mainboard_smi_apmc(u8 apmc)
 {
    switch (apmc) {
-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "SMI#: Already finalized\n");
    		return 0;
diff --git a/src/mainboard/google/parrot/smihandler.c b/src/mainboard/google/parrot/smihandler.c
index 1d1b23c..99fabfc 100644
--- a/src/mainboard/google/parrot/smihandler.c
+++ b/src/mainboard/google/parrot/smihandler.c
@@ -130,7 +130,6 @@ void mainboard_smi_sleep(u8 slp_typ)
    }
 }

-#define APMC_FINALIZE 0xcb
 #define APMC_ACPI_EN  0xe1
 #define APMC_ACPI_DIS 0x1e

@@ -140,7 +139,7 @@ int mainboard_smi_apmc(u8 apmc)
 {
    printk(BIOS_DEBUG, "mainboard_smi_apmc: %x\n", apmc);
    switch (apmc) {
-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	printk(BIOS_DEBUG, "APMC: FINALIZE\n");
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "APMC#: Already finalized\n");
diff --git a/src/mainboard/google/peppy/smihandler.c b/src/mainboard/google/peppy/smihandler.c
index e95dc4c..6bbfe5f 100644
--- a/src/mainboard/google/peppy/smihandler.c
+++ b/src/mainboard/google/peppy/smihandler.c
@@ -134,14 +134,13 @@ void mainboard_smi_sleep(u8 slp_typ)
    while (google_chromeec_get_event() != 0);
 }

-#define APMC_FINALIZE 0xcb

static int mainboard_finalized = 0;

int mainboard_smi_apmc(u8 apmc)
 {
    switch (apmc) {
-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "SMI#: Already finalized\n");
    		return 0;
diff --git a/src/mainboard/google/slippy/smihandler.c b/src/mainboard/google/slippy/smihandler.c
index f8eac31..7643fb1 100644
--- a/src/mainboard/google/slippy/smihandler.c
+++ b/src/mainboard/google/slippy/smihandler.c
@@ -121,14 +121,13 @@ void mainboard_smi_sleep(u8 slp_typ)
    while (google_chromeec_get_event() != 0);
 }

-#define APMC_FINALIZE 0xcb

static int mainboard_finalized = 0;

int mainboard_smi_apmc(u8 apmc)
 {
    switch (apmc) {
-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "SMI#: Already finalized\n");
    		return 0;
diff --git a/src/mainboard/google/stout/mainboard_smi.c b/src/mainboard/google/stout/mainboard_smi.c
index 7ab3cc5..c44e931 100644
--- a/src/mainboard/google/stout/mainboard_smi.c
+++ b/src/mainboard/google/stout/mainboard_smi.c
@@ -110,7 +110,6 @@ void mainboard_smi_sleep(u8 slp_typ)
    ec_it8518_enable_wake_events();
 }

-#define APMC_FINALIZE 0xcb
 #define APMC_ACPI_EN  0xe1
 #define APMC_ACPI_DIS 0x1e

@@ -119,7 +118,7 @@ static int mainboard_finalized = 0;
 int mainboard_smi_apmc(u8 apmc)
 {
    switch (apmc) {
-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "SMI#: Already finalized\n");
    		return 0;
diff --git a/src/mainboard/intel/baskingridge/mainboard_smi.c b/src/mainboard/intel/baskingridge/mainboard_smi.c
index f24af67..c86ef95 100644
--- a/src/mainboard/intel/baskingridge/mainboard_smi.c
+++ b/src/mainboard/intel/baskingridge/mainboard_smi.c
@@ -71,14 +71,13 @@ void mainboard_smi_sleep(u8 slp_typ)
    }
 }

-#define APMC_FINALIZE 0xcb

static int mainboard_finalized = 0;

int mainboard_smi_apmc(u8 apmc)
 {
    switch (apmc) {
-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "SMI#: Already finalized\n");
    		return 0;
diff --git a/src/mainboard/intel/cougar_canyon2/mainboard_smi.c b/src/mainboard/intel/cougar_canyon2/mainboard_smi.c
index 0116dc6..77e3bbc 100644
--- a/src/mainboard/intel/cougar_canyon2/mainboard_smi.c
+++ b/src/mainboard/intel/cougar_canyon2/mainboard_smi.c
@@ -72,14 +72,13 @@ void mainboard_smi_sleep(u8 slp_typ)
    }
 }

-#define APMC_FINALIZE 0xcb

static int mainboard_finalized = 0;

int mainboard_smi_apmc(u8 apmc)
 {
    switch (apmc) {
-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "SMI#: Already finalized\n");
    		return 0;
diff --git a/src/mainboard/intel/emeraldlake2/smihandler.c b/src/mainboard/intel/emeraldlake2/smihandler.c
index ba76eb8..e9aeb2a 100644
--- a/src/mainboard/intel/emeraldlake2/smihandler.c
+++ b/src/mainboard/intel/emeraldlake2/smihandler.c
@@ -71,14 +71,13 @@ void mainboard_smi_sleep(u8 slp_typ)
    }
 }

-#define APMC_FINALIZE 0xcb

static int mainboard_finalized = 0;

int mainboard_smi_apmc(u8 apmc)
 {
    switch (apmc) {
-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "SMI#: Already finalized\n");
    		return 0;
diff --git a/src/mainboard/kontron/ktqm77/smihandler.c b/src/mainboard/kontron/ktqm77/smihandler.c
index 18ff68d..9317943 100644
--- a/src/mainboard/kontron/ktqm77/smihandler.c
+++ b/src/mainboard/kontron/ktqm77/smihandler.c
@@ -53,7 +53,6 @@ void mainboard_smi_gpi(u32 gpi_sts)
    printk(BIOS_DEBUG, "warn: unknown mainboard_smi_gpi: %x\n", gpi_sts);
 }

-#define APMC_FINALIZE 0xcb

static int mainboard_finalized = 0;

@@ -61,7 +60,7 @@ int mainboard_smi_apmc(u8 apmc)
 {
    printk(BIOS_DEBUG, "mainboard_smi_apmc: %x\n", apmc);
    switch (apmc) {
-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	printk(BIOS_DEBUG, "APMC: FINALIZE\n");
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "APMC#: Already finalized\n");
diff --git a/src/mainboard/samsung/lumpy/smihandler.c b/src/mainboard/samsung/lumpy/smihandler.c
index 417ccd8..e560d0e 100644
--- a/src/mainboard/samsung/lumpy/smihandler.c
+++ b/src/mainboard/samsung/lumpy/smihandler.c
@@ -85,7 +85,6 @@ void mainboard_smi_gpi(u32 gpi_sts)
    }
 }

-#define APMC_FINALIZE 0xcb

static int mainboard_finalized = 0;

@@ -104,7 +103,7 @@ int mainboard_smi_apmc(u8 apmc)
    	send_ec_command(EC_ACPI_DISABLE);
    	break;

-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "SMI#: Already finalized\n");
    		return 0;
diff --git a/src/mainboard/samsung/stumpy/smihandler.c b/src/mainboard/samsung/stumpy/smihandler.c
index b232584..6625792 100644
--- a/src/mainboard/samsung/stumpy/smihandler.c
+++ b/src/mainboard/samsung/stumpy/smihandler.c
@@ -89,14 +89,13 @@ void mainboard_smi_sleep(u8 slp_typ)
    }
 }

-#define APMC_FINALIZE 0xcb

static int mainboard_finalized = 0;

int mainboard_smi_apmc(u8 apmc)
 {
    switch (apmc) {
-	case APMC_FINALIZE:
+	case APM_CNT_FINALIZE:
    	if (mainboard_finalized) {
    		printk(BIOS_DEBUG, "SMI#: Already finalized\n");
    		return 0;