7 files changed, 10 insertions, 36 deletions

diff --git a/Documentation/acpi/enumeration.txt b/Documentation/acpi/enumeration.txt
index b60d2ab69497..9b121a569ab4 100644
--- a/Documentation/acpi/enumeration.txt
+++ b/Documentation/acpi/enumeration.txt
@@ -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,
diff --git a/MAINTAINERS b/MAINTAINERS
index d66a97dd3a12..a52ed9cfcbe4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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>
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index e795cb848154..2c4498919d3c 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -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 */
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index b9e30daa0881..14d3652ece8d 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -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 "
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 24b5476449a1..1333cbdc3ea2 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -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. */
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 8aa9254a387f..7f251dd1a687 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -321,7 +321,7 @@ static struct dmi_system_id acpisleep_dmi_table[] __initdata = {
         {},
 };
 
-static void acpi_sleep_dmi_check(void)
+static void __init acpi_sleep_dmi_check(void)
 {
         int year;
 
diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c
index 6dbf6fcbdfaf..e8902f8dddfc 100644
--- a/drivers/mailbox/pcc.c
+++ b/drivers/mailbox/pcc.c
@@ -386,7 +386,7 @@ static int __init pcc_init(void)
         ret = acpi_pcc_probe();
 
         if (ret) {
-                pr_err("ACPI PCC probe failed.\n");
+                pr_debug("ACPI PCC probe failed.\n");
                 return -ENODEV;
         }
 
@@ -394,7 +394,7 @@ static int __init pcc_init(void)
                         pcc_mbox_probe, NULL, 0, NULL, 0);
 
         if (!pcc_pdev) {
-                pr_err("Err creating PCC platform bundle\n");
+                pr_debug("Err creating PCC platform bundle\n");
                 return -ENODEV;
         }