Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  gcc-4.6: ACPI: fix unused but set variables in ACPI
  ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS
  ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS
  ACPI processor: remove deprecated ACPI procfs I/F
  ACPI power_resource: remove unused procfs I/F
  ACPI: remove deprecated ACPI procfs I/F
  ACPI: introduce drivers/acpi/sysfs.c
  ACPI: introduce module parameter acpi.aml_debug_output
  ACPI: introduce drivers/acpi/debugfs.c
  ACPI, APEI, ERST debug support
  ACPI, APEI, Manage GHES as platform devices
  ACPI, APEI, Rename CPER and GHES severity constants
  ACPI, APEI, Fix a typo of error path of apei_resources_request
  ACPI / ACPICA: Fix reference counting problems with GPE handlers
  ACPI: Add the check of ADR flag in course of finding ACPI handle for PCI device
  ACPI / Sleep: Drop acpi_suspend_finish()
  ACPI / Sleep: Consolidate suspend and hibernation routines
  ACPI / Wakeup: Simplify enabling of wakeup devices
  ACPI / Sleep: Rework enabling wakeup devices
  ACPI / Sleep: Free NVS copy if suspending of devices fails

Fixed up totally buggered "ACPI: fix unused but set variables in ACPI"
patch that doesn't even compile in the merge.

Thanks to Sedat Dilek <sedat.dilek@googlemail.com> for noticing the
breakage before I even pulled.  And a big "Grrr.." at Len for not even
bothering to compile the tree before asking me to pull.

1 files changed, 1 insertions, 128 deletions

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index f74d3b31e5c9..844c155aeb0f 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -40,8 +40,6 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/slab.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include "sleep.h"
@@ -64,7 +62,6 @@ module_param_named(power_nocheck, acpi_power_nocheck, bool, 000);
 static int acpi_power_add(struct acpi_device *device);
 static int acpi_power_remove(struct acpi_device *device, int type);
 static int acpi_power_resume(struct acpi_device *device);
-static int acpi_power_open_fs(struct inode *inode, struct file *file);
 
 static const struct acpi_device_id power_device_ids[] = {
         {ACPI_POWER_HID, 0},
@@ -99,14 +96,6 @@ struct acpi_power_resource {
 
 static struct list_head acpi_power_resource_list;
 
-static const struct file_operations acpi_power_fops = {
-        .owner = THIS_MODULE,
-        .open = acpi_power_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
 /* --------------------------------------------------------------------------
                              Power Resource Management
    -------------------------------------------------------------------------- */
@@ -255,7 +244,6 @@ static int acpi_power_off_device(acpi_handle handle, struct acpi_device *dev)
         struct list_head *node, *next;
         struct acpi_power_reference *ref;
 
-
         result = acpi_power_get_context(handle, &resource);
         if (result)
                 return result;
@@ -542,102 +530,6 @@ int acpi_power_transition(struct acpi_device *device, int state)
 }
 
 /* --------------------------------------------------------------------------
-                              FS Interface (/proc)
-   -------------------------------------------------------------------------- */
-
-static struct proc_dir_entry *acpi_power_dir;
-
-static int acpi_power_seq_show(struct seq_file *seq, void *offset)
-{
-        int count = 0;
-        int result = 0, state;
-        struct acpi_power_resource *resource = NULL;
-        struct list_head *node, *next;
-        struct acpi_power_reference *ref;
-
-
-        resource = seq->private;
-
-        if (!resource)
-                goto end;
-
-        result = acpi_power_get_state(resource->device->handle, &state);
-        if (result)
-                goto end;
-
-        seq_puts(seq, "state:                   ");
-        switch (state) {
-        case ACPI_POWER_RESOURCE_STATE_ON:
-                seq_puts(seq, "on\n");
-                break;
-        case ACPI_POWER_RESOURCE_STATE_OFF:
-                seq_puts(seq, "off\n");
-                break;
-        default:
-                seq_puts(seq, "unknown\n");
-                break;
-        }
-
-        mutex_lock(&resource->resource_lock);
-        list_for_each_safe(node, next, &resource->reference) {
-                ref = container_of(node, struct acpi_power_reference, node);
-                count++;
-        }
-        mutex_unlock(&resource->resource_lock);
-
-        seq_printf(seq, "system level:            S%d\n"
-                   "order:                   %d\n"
-                   "reference count:         %d\n",
-                   resource->system_level,
-                   resource->order, count);
-
-      end:
-        return 0;
-}
-
-static int acpi_power_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_power_seq_show, PDE(inode)->data);
-}
-
-static int acpi_power_add_fs(struct acpi_device *device)
-{
-        struct proc_dir_entry *entry = NULL;
-
-
-        if (!device)
-                return -EINVAL;
-
-        if (!acpi_device_dir(device)) {
-                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
-                                                     acpi_power_dir);
-                if (!acpi_device_dir(device))
-                        return -ENODEV;
-        }
-
-        /* 'status' [R] */
-        entry = proc_create_data(ACPI_POWER_FILE_STATUS,
-                                 S_IRUGO, acpi_device_dir(device),
-                                 &acpi_power_fops, acpi_driver_data(device));
-        if (!entry)
-                return -EIO;
-        return 0;
-}
-
-static int acpi_power_remove_fs(struct acpi_device *device)
-{
-
-        if (acpi_device_dir(device)) {
-                remove_proc_entry(ACPI_POWER_FILE_STATUS,
-                                  acpi_device_dir(device));
-                remove_proc_entry(acpi_device_bid(device), acpi_power_dir);
-                acpi_device_dir(device) = NULL;
-        }
-
-        return 0;
-}
-
-/* --------------------------------------------------------------------------
                                 Driver Interface
    -------------------------------------------------------------------------- */
 
@@ -690,10 +582,6 @@ static int acpi_power_add(struct acpi_device *device)
                 break;
         }
 
-        result = acpi_power_add_fs(device);
-        if (result)
-                goto end;
-
         printk(KERN_INFO PREFIX "%s [%s] (%s)\n", acpi_device_name(device),
                acpi_device_bid(device), state ? "on" : "off");
 
@@ -715,8 +603,6 @@ static int acpi_power_remove(struct acpi_device *device, int type)
 
         resource = acpi_driver_data(device);
 
-        acpi_power_remove_fs(device);
-
         mutex_lock(&resource->resource_lock);
         list_for_each_safe(node, next, &resource->reference) {
                 struct acpi_power_reference *ref = container_of(node, struct acpi_power_reference, node);
@@ -760,19 +646,6 @@ static int acpi_power_resume(struct acpi_device *device)
 
 int __init acpi_power_init(void)
 {
-        int result = 0;
-
         INIT_LIST_HEAD(&acpi_power_resource_list);
-
-        acpi_power_dir = proc_mkdir(ACPI_POWER_CLASS, acpi_root_dir);
-        if (!acpi_power_dir)
-                return -ENODEV;
-
-        result = acpi_bus_register_driver(&acpi_power_driver);
-        if (result < 0) {
-                remove_proc_entry(ACPI_POWER_CLASS, acpi_root_dir);
-                return -ENODEV;
-        }
-
-        return 0;
+        return acpi_bus_register_driver(&acpi_power_driver);
 }