From 3026e473dafa1d06f69f44fda19aab75fb15ed8a Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 16 May 2015 13:33:49 +0200 Subject: 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 Reviewed-on: http://review.coreboot.org/10226 Tested-by: build bot (Jenkins) Reviewed-by: Nicolas Reinecke --- 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(-) (limited to 'src') diff --git a/src/mainboard/google/bolt/smihandler.c b/src/mainboard/google/bolt/smihandler.c index 54dcb73077..7bc978e1e5 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 a40e4288ba..1876f319ea 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 511bfc58ed..e86787b227 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 24fa8b5ce4..d60d319a4c 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 3448648849..a551b49f7d 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 1d1b23c02d..99fabfccbf 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 e95dc4c760..6bbfe5fe9d 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 f8eac31699..7643fb1897 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 7ab3cc5014..c44e9311e8 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 f24af67579..c86ef95ac8 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 0116dc6f2d..77e3bbcda1 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 ba76eb8bbf..e9aeb2a4a2 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 18ff68ddfa..9317943576 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 417ccd87fb..e560d0edad 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 b23258473b..662579221c 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; -- cgit v1.2.3