| Message ID | a950c135e5b2be6ef7518d54d98a7901db1b377a.1349554105.git.len.brown@intel.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Sat, Oct 06, 2012 at 04:09:22PM -0400, Len Brown wrote: > From: Feng Tang <feng.tang@intel.com> The title has 'delete' misspelled. > > This is a follow on for commmit 3f6f49c7 "ACPI: delete _GTS/_BFS support" > to do more cleanup. > > Signed-off-by: Feng Tang <feng.tang@intel.com> > Signed-off-by: Bob Moore <robert.moore@intel.com> > Signed-off-by: Len Brown <len.brown@intel.com> > --- > drivers/acpi/acpica/hwxfsleep.c | 1 - > include/acpi/acnames.h | 2 -- > include/acpi/actypes.h | 7 ------- > 3 files changed, 10 deletions(-) > > diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c > index 1f165a7..0ff1ece 100644 > --- a/drivers/acpi/acpica/hwxfsleep.c > +++ b/drivers/acpi/acpica/hwxfsleep.c > @@ -381,7 +381,6 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state) > * FUNCTION: acpi_leave_sleep_state_prep > * > * PARAMETERS: sleep_state - Which sleep state we are exiting > - * flags - ACPI_EXECUTE_BFS to run optional method > * > * RETURN: Status > * > diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h > index d988ac5..d2f61dd 100644 > --- a/include/acpi/acnames.h > +++ b/include/acpi/acnames.h > @@ -66,8 +66,6 @@ > > /* Method names - these methods must appear at the namespace root */ > > -#define METHOD_PATHNAME__BFS "\\_BFS" > -#define METHOD_PATHNAME__GTS "\\_GTS" > #define METHOD_PATHNAME__PTS "\\_PTS" > #define METHOD_PATHNAME__SST "\\_SI._SST" > #define METHOD_PATHNAME__WAK "\\_WAK" > diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h > index 3d00bd5..a85bae9 100644 > --- a/include/acpi/actypes.h > +++ b/include/acpi/actypes.h > @@ -519,13 +519,6 @@ typedef u64 acpi_integer; > #define ACPI_SLEEP_TYPE_INVALID 0xFF > > /* > - * Sleep/Wake flags > - */ > -#define ACPI_NO_OPTIONAL_METHODS 0x00 /* Do not execute any optional methods */ > -#define ACPI_EXECUTE_GTS 0x01 /* For enter sleep interface */ > -#define ACPI_EXECUTE_BFS 0x02 /* For leave sleep prep interface */ > - > -/* > * Standard notify values > */ > #define ACPI_NOTIFY_BUS_CHECK (u8) 0x00 > -- > 1.8.0.rc0.18.gf84667d > > -- > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c index 1f165a7..0ff1ece 100644 --- a/drivers/acpi/acpica/hwxfsleep.c +++ b/drivers/acpi/acpica/hwxfsleep.c @@ -381,7 +381,6 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state) * FUNCTION: acpi_leave_sleep_state_prep * * PARAMETERS: sleep_state - Which sleep state we are exiting - * flags - ACPI_EXECUTE_BFS to run optional method * * RETURN: Status * diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h index d988ac5..d2f61dd 100644 --- a/include/acpi/acnames.h +++ b/include/acpi/acnames.h @@ -66,8 +66,6 @@ /* Method names - these methods must appear at the namespace root */ -#define METHOD_PATHNAME__BFS "\\_BFS" -#define METHOD_PATHNAME__GTS "\\_GTS" #define METHOD_PATHNAME__PTS "\\_PTS" #define METHOD_PATHNAME__SST "\\_SI._SST" #define METHOD_PATHNAME__WAK "\\_WAK" diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 3d00bd5..a85bae9 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -519,13 +519,6 @@ typedef u64 acpi_integer; #define ACPI_SLEEP_TYPE_INVALID 0xFF /* - * Sleep/Wake flags - */ -#define ACPI_NO_OPTIONAL_METHODS 0x00 /* Do not execute any optional methods */ -#define ACPI_EXECUTE_GTS 0x01 /* For enter sleep interface */ -#define ACPI_EXECUTE_BFS 0x02 /* For leave sleep prep interface */ - -/* * Standard notify values */ #define ACPI_NOTIFY_BUS_CHECK (u8) 0x00