Commit 25fe6423 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-apei', 'acpi-misc' and 'acpi-processor' 

* acpi-apei:
  ACPI, APEI: make apei_resources_all static

* acpi-misc:
  ACPI: acpi_drivers.h: Update the kernel doc
  ACPI: acpi_drivers.h: Remove the leftover dead code
  ACPI: tiny-power-button: Simplify the code using module_acpi_driver()
  ACPI: SBS: Simplify the code using module_acpi_driver()
  ACPI: SBS: Simplify the driver init code
  ACPI: debug: Remove the not used function
  ACPI: processor: Remove the duplicated ACPI_PROCESSOR_CLASS macro

* acpi-processor:
  ACPI: processor: Drop duplicate setting of shared_cpu_map
parents 5e2cde03 423282af ec2a9cea 55130fb2

drivers/acpi/acpi_dbg.c

+0 −7
Original line number Diff line number Diff line
@@ -117,13 +117,6 @@ static inline bool __acpi_aml_busy(void) 
	return false;

}



static inline bool __acpi_aml_opened(void)

{

	if (acpi_aml_io.flags & ACPI_AML_OPEN)

		return true;

	return false;

}



static inline bool __acpi_aml_used(void)

{

	return acpi_aml_io.usages ? true : false;

drivers/acpi/apei/apei-base.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ struct apei_res { 
};



/* Collect all resources requested, to avoid conflict */

struct apei_resources apei_resources_all = {

static struct apei_resources apei_resources_all = {

	.iomem = LIST_HEAD_INIT(apei_resources_all.iomem),

	.ioport = LIST_HEAD_INIT(apei_resources_all.ioport),

};

drivers/acpi/processor_idle.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <asm/apic.h>

#endif



#define ACPI_PROCESSOR_CLASS            "processor"

#define _COMPONENT              ACPI_PROCESSOR_COMPONENT

ACPI_MODULE_NAME("processor_idle");

drivers/acpi/processor_perflib.c

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#define PREFIX "ACPI: "



#define ACPI_PROCESSOR_CLASS		"processor"

#define ACPI_PROCESSOR_FILE_PERFORMANCE	"performance"

#define _COMPONENT		ACPI_PROCESSOR_COMPONENT

ACPI_MODULE_NAME("processor_perflib");
@@ -616,7 +615,6 @@ int acpi_processor_preregister_performance( 
			continue;



		pr->performance = per_cpu_ptr(performance, i);

		cpumask_set_cpu(i, pr->performance->shared_cpu_map);

		pdomain = &(pr->performance->domain_info);

		if (acpi_processor_get_psd(pr->handle, pdomain)) {

			retval = -EINVAL;

drivers/acpi/processor_thermal.c

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 


#define PREFIX "ACPI: "



#define ACPI_PROCESSOR_CLASS            "processor"



#ifdef CONFIG_CPU_FREQ



/* If a passive cooling situation is detected, primarily CPUfreq is used, as it

CRA Git | Maintained and supported by SUSTech CRA and CCSE