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

Merge branches 'acpi-doc', 'acpi-pm', 'acpi-pcc' and 'acpi-tables' 

* acpi-doc:
  MAINTAINERS / ACPI: add the necessary '/' according to entry rules
  ACPI / Documentation: add a missing '='

* acpi-pm:
  ACPI / sleep: mark acpi_sleep_dmi_check() __init

* acpi-pcc:
  ACPI / PCC: Use pr_debug() for debug messages in pcc_init()

* acpi-tables:
  ACPI / table: remove duplicate NULL check for the handler of acpi_table_parse()
parents 99e4d89a 3a75ef0c 8b691c9c efd756da 2fad9308

Documentation/acpi/enumeration.txt

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ input driver: 
			.owner	= THIS_MODULE,

			.pm	= &mpu3050_pm,

			.of_match_table = mpu3050_of_match,

			.acpi_match_table  ACPI_PTR(mpu3050_acpi_match),

			.acpi_match_table = ACPI_PTR(mpu3050_acpi_match),

		},

		.probe		= mpu3050_probe,

		.remove		= mpu3050_remove,

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -270,12 +270,12 @@ F: drivers/acpi/ 
F:	drivers/pnp/pnpacpi/

F:	include/linux/acpi.h

F:	include/acpi/

F:	Documentation/acpi

F:	Documentation/acpi/

F:	Documentation/ABI/testing/sysfs-bus-acpi

F:	drivers/pci/*acpi*

F:	drivers/pci/*/*acpi*

F:	drivers/pci/*/*/*acpi*

F:	tools/power/acpi

F:	tools/power/acpi/



ACPI COMPONENT ARCHITECTURE (ACPICA)

M:	Robert Moore <robert.moore@intel.com>

arch/ia64/kernel/acpi.c

+0 −6
Original line number Diff line number Diff line
@@ -380,9 +380,6 @@ static void __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) 


static int __init acpi_parse_madt(struct acpi_table_header *table)

{

	if (!table)

		return -EINVAL;



	acpi_madt = (struct acpi_table_madt *)table;



	acpi_madt_rev = acpi_madt->header.revision;
@@ -645,9 +642,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) 
	struct acpi_table_header *fadt_header;

	struct acpi_table_fadt *fadt;



	if (!table)

		return -EINVAL;



	fadt_header = (struct acpi_table_header *)table;

	if (fadt_header->revision != 3)

		return -ENODEV;	/* Only deal with ACPI 2.0 FADT */

arch/x86/kernel/acpi/boot.c

+2 −14
Original line number Diff line number Diff line
@@ -843,13 +843,7 @@ int acpi_ioapic_registered(acpi_handle handle, u32 gsi_base) 


static int __init acpi_parse_sbf(struct acpi_table_header *table)

{

	struct acpi_table_boot *sb;



	sb = (struct acpi_table_boot *)table;

	if (!sb) {

		printk(KERN_WARNING PREFIX "Unable to map SBF\n");

		return -ENODEV;

	}

	struct acpi_table_boot *sb = (struct acpi_table_boot *)table;



	sbf_port = sb->cmos_index;	/* Save CMOS port */
@@ -863,13 +857,7 @@ static struct resource *hpet_res __initdata; 


static int __init acpi_parse_hpet(struct acpi_table_header *table)

{

	struct acpi_table_hpet *hpet_tbl;



	hpet_tbl = (struct acpi_table_hpet *)table;

	if (!hpet_tbl) {

		printk(KERN_WARNING PREFIX "Unable to map HPET\n");

		return -ENODEV;

	}

	struct acpi_table_hpet *hpet_tbl = (struct acpi_table_hpet *)table;



	if (hpet_tbl->address.space_id != ACPI_SPACE_MEM) {

		printk(KERN_WARNING PREFIX "HPET timers must be located in "

drivers/acpi/numa.c

+2 −10
Original line number Diff line number Diff line
@@ -177,12 +177,7 @@ static int __init slit_valid(struct acpi_table_slit *slit) 


static int __init acpi_parse_slit(struct acpi_table_header *table)

{

	struct acpi_table_slit *slit;



	if (!table)

		return -EINVAL;



	slit = (struct acpi_table_slit *)table;

	struct acpi_table_slit *slit = (struct acpi_table_slit *)table;



	if (!slit_valid(slit)) {

		printk(KERN_INFO "ACPI: SLIT table looks invalid. Not used.\n");
@@ -260,11 +255,8 @@ acpi_parse_memory_affinity(struct acpi_subtable_header * header, 


static int __init acpi_parse_srat(struct acpi_table_header *table)

{

	struct acpi_table_srat *srat;

	if (!table)

		return -EINVAL;

	struct acpi_table_srat *srat = (struct acpi_table_srat *)table;



	srat = (struct acpi_table_srat *)table;

	acpi_srat_revision = srat->header.revision;



	/* Real work done in acpi_table_parse_srat below. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE