Pull sn-features into release branch
[sfrench/cifs-2.6.git] / drivers / acpi / scan.c
index cbcda30c172dd1876b4f5928c59d20ae0c610132..c6db591479de3e02504d40ac8e0cee2d2bebdeab 100644 (file)
@@ -9,14 +9,10 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/acinterp.h>     /* for acpi_ex_eisa_id_to_string() */
 
-
 #define _COMPONENT             ACPI_BUS_COMPONENT
-ACPI_MODULE_NAME               ("scan")
-
+ACPI_MODULE_NAME("scan")
 #define STRUCT_TO_INT(s)       (*((int*)&s))
-
-extern struct acpi_device              *acpi_root;
-
+extern struct acpi_device *acpi_root;
 
 #define ACPI_BUS_CLASS                 "system_bus"
 #define ACPI_BUS_HID                   "ACPI_BUS"
@@ -27,13 +23,11 @@ static LIST_HEAD(acpi_device_list);
 DEFINE_SPINLOCK(acpi_device_lock);
 LIST_HEAD(acpi_wakeup_device_list);
 
-static int
-acpi_bus_trim(struct acpi_device       *start,
-               int rmdevice);
+static int acpi_bus_trim(struct acpi_device *start, int rmdevice);
 
-static void acpi_device_release(struct kobject * kobj)
+static void acpi_device_release(struct kobject *kobj)
 {
-       struct acpi_device * dev = container_of(kobj,struct acpi_device,kobj);
+       struct acpi_device *dev = container_of(kobj, struct acpi_device, kobj);
        if (dev->pnp.cid_list)
                kfree(dev->pnp.cid_list);
        kfree(dev);
@@ -41,34 +35,34 @@ static void acpi_device_release(struct kobject * kobj)
 
 struct acpi_device_attribute {
        struct attribute attr;
-       ssize_t (*show)(struct acpi_device *, char *);
-       ssize_t (*store)(struct acpi_device *, const char *, size_t);
+        ssize_t(*show) (struct acpi_device *, char *);
+        ssize_t(*store) (struct acpi_device *, const char *, size_t);
 };
 
 typedef void acpi_device_sysfs_files(struct kobject *,
-                               const struct attribute *);
+                                    const struct attribute *);
 
 static void setup_sys_fs_device_files(struct acpi_device *dev,
-               acpi_device_sysfs_files *func);
+                                     acpi_device_sysfs_files * func);
 
 #define create_sysfs_device_files(dev) \
        setup_sys_fs_device_files(dev, (acpi_device_sysfs_files *)&sysfs_create_file)
 #define remove_sysfs_device_files(dev) \
        setup_sys_fs_device_files(dev, (acpi_device_sysfs_files *)&sysfs_remove_file)
 
-
 #define to_acpi_device(n) container_of(n, struct acpi_device, kobj)
 #define to_handle_attr(n) container_of(n, struct acpi_device_attribute, attr);
 
 static ssize_t acpi_device_attr_show(struct kobject *kobj,
-               struct attribute *attr, char *buf)
+                                    struct attribute *attr, char *buf)
 {
        struct acpi_device *device = to_acpi_device(kobj);
        struct acpi_device_attribute *attribute = to_handle_attr(attr);
        return attribute->show ? attribute->show(device, buf) : -EIO;
 }
 static ssize_t acpi_device_attr_store(struct kobject *kobj,
-               struct attribute *attr, const char *buf, size_t len)
+                                     struct attribute *attr, const char *buf,
+                                     size_t len)
 {
        struct acpi_device *device = to_acpi_device(kobj);
        struct acpi_device_attribute *attribute = to_handle_attr(attr);
@@ -76,13 +70,13 @@ static ssize_t acpi_device_attr_store(struct kobject *kobj,
 }
 
 static struct sysfs_ops acpi_device_sysfs_ops = {
-       .show   = acpi_device_attr_show,
-       .store  = acpi_device_attr_store,
+       .show = acpi_device_attr_show,
+       .store = acpi_device_attr_store,
 };
 
 static struct kobj_type ktype_acpi_ns = {
-       .sysfs_ops      = &acpi_device_sysfs_ops,
-       .release        = acpi_device_release,
+       .sysfs_ops = &acpi_device_sysfs_ops,
+       .release = acpi_device_release,
 };
 
 static int namespace_hotplug(struct kset *kset, struct kobject *kobj,
@@ -110,16 +104,16 @@ static struct kset_hotplug_ops namespace_hotplug_ops = {
 };
 
 static struct kset acpi_namespace_kset = {
-       .kobj           = { 
-               .name = "namespace",
-       },
+       .kobj = {
+                .name = "namespace",
+                },
        .subsys = &acpi_subsys,
-       .ktype  = &ktype_acpi_ns,
+       .ktype = &ktype_acpi_ns,
        .hotplug_ops = &namespace_hotplug_ops,
 };
 
-
-static void acpi_device_register(struct acpi_device * device, struct acpi_device * parent)
+static void acpi_device_register(struct acpi_device *device,
+                                struct acpi_device *parent)
 {
        /*
         * Linkage
@@ -134,14 +128,14 @@ static void acpi_device_register(struct acpi_device * device, struct acpi_device
        spin_lock(&acpi_device_lock);
        if (device->parent) {
                list_add_tail(&device->node, &device->parent->children);
-               list_add_tail(&device->g_list,&device->parent->g_list);
+               list_add_tail(&device->g_list, &device->parent->g_list);
        } else
-               list_add_tail(&device->g_list,&acpi_device_list);
+               list_add_tail(&device->g_list, &acpi_device_list);
        if (device->wakeup.flags.valid)
-               list_add_tail(&device->wakeup_list,&acpi_wakeup_device_list);
+               list_add_tail(&device->wakeup_list, &acpi_wakeup_device_list);
        spin_unlock(&acpi_device_lock);
 
-       strlcpy(device->kobj.name,device->pnp.bus_id,KOBJ_NAME_LEN);
+       strlcpy(device->kobj.name, device->pnp.bus_id, KOBJ_NAME_LEN);
        if (parent)
                device->kobj.parent = &parent->kobj;
        device->kobj.ktype = &ktype_acpi_ns;
@@ -150,10 +144,7 @@ static void acpi_device_register(struct acpi_device * device, struct acpi_device
        create_sysfs_device_files(device);
 }
 
-static int
-acpi_device_unregister (
-       struct acpi_device      *device, 
-       int                     type)
+static int acpi_device_unregister(struct acpi_device *device, int type)
 {
        spin_lock(&acpi_device_lock);
        if (device->parent) {
@@ -172,11 +163,7 @@ acpi_device_unregister (
        return 0;
 }
 
-void
-acpi_bus_data_handler (
-       acpi_handle             handle,
-       u32                     function,
-       void                    *context)
+void acpi_bus_data_handler(acpi_handle handle, u32 function, void *context)
 {
        ACPI_FUNCTION_TRACE("acpi_bus_data_handler");
 
@@ -185,13 +172,11 @@ acpi_bus_data_handler (
        return_VOID;
 }
 
-static int
-acpi_bus_get_power_flags (
-       struct acpi_device      *device)
+static int acpi_bus_get_power_flags(struct acpi_device *device)
 {
-       acpi_status             status = 0;
-       acpi_handle             handle = NULL;
-       u32                     i = 0;
+       acpi_status status = 0;
+       acpi_handle handle = NULL;
+       u32 i = 0;
 
        ACPI_FUNCTION_TRACE("acpi_bus_get_power_flags");
 
@@ -210,11 +195,11 @@ acpi_bus_get_power_flags (
         */
        for (i = ACPI_STATE_D0; i <= ACPI_STATE_D3; i++) {
                struct acpi_device_power_state *ps = &device->power.states[i];
-               char            object_name[5] = {'_','P','R','0'+i,'\0'};
+               char object_name[5] = { '_', 'P', 'R', '0' + i, '\0' };
 
                /* Evaluate "_PRx" to se if power resources are referenced */
                acpi_evaluate_reference(device->handle, object_name, NULL,
-                       &ps->resources);
+                                       &ps->resources);
                if (ps->resources.count) {
                        device->power.flags.power_resources = 1;
                        ps->flags.valid = 1;
@@ -232,7 +217,7 @@ acpi_bus_get_power_flags (
                if (ps->resources.count || ps->flags.explicit_set)
                        ps->flags.valid = 1;
 
-               ps->power = -1;         /* Unknown - driver assigned */
+               ps->power = -1; /* Unknown - driver assigned */
                ps->latency = -1;       /* Unknown - driver assigned */
        }
 
@@ -249,13 +234,10 @@ acpi_bus_get_power_flags (
        return_VALUE(0);
 }
 
-int
-acpi_match_ids (
-       struct acpi_device      *device,
-       char                    *ids)
+int acpi_match_ids(struct acpi_device *device, char *ids)
 {
        int error = 0;
-       struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
        if (device->flags.hardware_id)
                if (strstr(ids, device->pnp.hardware_id))
@@ -266,27 +248,25 @@ acpi_match_ids (
                int i;
 
                /* compare multiple _CID entries against driver ids */
-               for (i = 0; i < cid_list->count; i++)
-               {
+               for (i = 0; i < cid_list->count; i++) {
                        if (strstr(ids, cid_list->id[i].value))
                                goto Done;
                }
        }
        error = -ENOENT;
 
- Done:
     Done:
        if (buffer.pointer)
                acpi_os_free(buffer.pointer);
        return error;
 }
 
 static acpi_status
-acpi_bus_extract_wakeup_device_power_package (
-       struct acpi_device      *device,
-       union acpi_object       *package)
+acpi_bus_extract_wakeup_device_power_package(struct acpi_device *device,
+                                            union acpi_object *package)
 {
-       int      i = 0;
-       union acpi_object       *element = NULL;
+       int i = 0;
+       union acpi_object *element = NULL;
 
        if (!device || !package || (package->package.count < 2))
                return AE_BAD_PARAMETER;
@@ -296,14 +276,17 @@ acpi_bus_extract_wakeup_device_power_package (
                return AE_BAD_PARAMETER;
        if (element->type == ACPI_TYPE_PACKAGE) {
                if ((element->package.count < 2) ||
-                       (element->package.elements[0].type != ACPI_TYPE_LOCAL_REFERENCE) ||
-                       (element->package.elements[1].type != ACPI_TYPE_INTEGER))
+                   (element->package.elements[0].type !=
+                    ACPI_TYPE_LOCAL_REFERENCE)
+                   || (element->package.elements[1].type != ACPI_TYPE_INTEGER))
                        return AE_BAD_DATA;
-               device->wakeup.gpe_device = element->package.elements[0].reference.handle;
-               device->wakeup.gpe_number = (u32)element->package.elements[1].integer.value;
-       }else if (element->type == ACPI_TYPE_INTEGER) {
+               device->wakeup.gpe_device =
+                   element->package.elements[0].reference.handle;
+               device->wakeup.gpe_number =
+                   (u32) element->package.elements[1].integer.value;
+       } else if (element->type == ACPI_TYPE_INTEGER) {
                device->wakeup.gpe_number = element->integer.value;
-       }else
+       } else
                return AE_BAD_DATA;
 
        element = &(package->package.elements[1]);
@@ -316,9 +299,9 @@ acpi_bus_extract_wakeup_device_power_package (
                return AE_NO_MEMORY;
        }
        device->wakeup.resources.count = package->package.count - 2;
-       for (i=0; i < device->wakeup.resources.count; i++) {
+       for (i = 0; i < device->wakeup.resources.count; i++) {
                element = &(package->package.elements[i + 2]);
-               if (element->type != ACPI_TYPE_ANY ) {
+               if (element->type != ACPI_TYPE_ANY) {
                        return AE_BAD_DATA;
                }
 
@@ -328,13 +311,11 @@ acpi_bus_extract_wakeup_device_power_package (
        return AE_OK;
 }
 
-static int
-acpi_bus_get_wakeup_device_flags (
-       struct acpi_device      *device)
+static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
 {
-       acpi_status     status = 0;
-       struct acpi_buffer      buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-       union acpi_object       *package = NULL;
+       acpi_status status = 0;
+       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+       union acpi_object *package = NULL;
 
        ACPI_FUNCTION_TRACE("acpi_bus_get_wakeup_flags");
 
@@ -345,21 +326,22 @@ acpi_bus_get_wakeup_device_flags (
                goto end;
        }
 
-       package = (union acpi_object *) buffer.pointer;
+       package = (union acpi_object *)buffer.pointer;
        status = acpi_bus_extract_wakeup_device_power_package(device, package);
        if (ACPI_FAILURE(status)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error extracting _PRW package\n"));
+               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                 "Error extracting _PRW package\n"));
                goto end;
        }
 
        acpi_os_free(buffer.pointer);
 
        device->wakeup.flags.valid = 1;
-       /* Power button, Lid switch always enable wakeup*/
+       /* Power button, Lid switch always enable wakeup */
        if (!acpi_match_ids(device, "PNP0C0D,PNP0C0C,PNP0C0E"))
                device->wakeup.flags.run_wake = 1;
 
-end:
+      end:
        if (ACPI_FAILURE(status))
                device->flags.wake_capable = 0;
        return_VALUE(0);
@@ -368,8 +350,8 @@ end:
 /* --------------------------------------------------------------------------
                ACPI hotplug sysfs device file support
    -------------------------------------------------------------------------- */
-static ssize_t acpi_eject_store(struct acpi_device *device, 
-               const char *buf, size_t count);
+static ssize_t acpi_eject_store(struct acpi_device *device,
+                               const char *buf, size_t count);
 
 #define ACPI_DEVICE_ATTR(_name,_mode,_show,_store) \
 static struct acpi_device_attribute acpi_device_attr_##_name = \
@@ -383,12 +365,11 @@ ACPI_DEVICE_ATTR(eject, 0200, NULL, acpi_eject_store);
  * @func:      function pointer to create or destroy the device file
  */
 static void
-setup_sys_fs_device_files (
-       struct acpi_device *dev,
-       acpi_device_sysfs_files *func)
+setup_sys_fs_device_files(struct acpi_device *dev,
+                         acpi_device_sysfs_files * func)
 {
-       acpi_status             status;
-       acpi_handle             temp = NULL;
+       acpi_status status;
+       acpi_handle temp = NULL;
 
        /*
         * If device has _EJ0, 'eject' file is created that is used to trigger
@@ -396,11 +377,10 @@ setup_sys_fs_device_files (
         */
        status = acpi_get_handle(dev->handle, "_EJ0", &temp);
        if (ACPI_SUCCESS(status))
-               (*(func))(&dev->kobj,&acpi_device_attr_eject.attr);
+               (*(func)) (&dev->kobj, &acpi_device_attr_eject.attr);
 }
 
-static int
-acpi_eject_operation(acpi_handle handle, int lockable)
+static int acpi_eject_operation(acpi_handle handle, int lockable)
 {
        struct acpi_object_list arg_list;
        union acpi_object arg;
@@ -429,27 +409,25 @@ acpi_eject_operation(acpi_handle handle, int lockable)
 
        status = acpi_evaluate_object(handle, "_EJ0", &arg_list, NULL);
        if (ACPI_FAILURE(status)) {
-               return(-ENODEV);
+               return (-ENODEV);
        }
 
-       return(0);
+       return (0);
 }
 
-
 static ssize_t
 acpi_eject_store(struct acpi_device *device, const char *buf, size_t count)
 {
-       int     result;
-       int     ret = count;
-       int     islockable;
-       acpi_status     status;
-       acpi_handle     handle;
-       acpi_object_type        type = 0;
+       int result;
+       int ret = count;
+       int islockable;
+       acpi_status status;
+       acpi_handle handle;
+       acpi_object_type type = 0;
 
        if ((!count) || (buf[0] != '1')) {
                return -EINVAL;
        }
-
 #ifndef FORCE_EJECT
        if (device->driver == NULL) {
                ret = -ENODEV;
@@ -457,7 +435,7 @@ acpi_eject_store(struct acpi_device *device, const char *buf, size_t count)
        }
 #endif
        status = acpi_get_type(device->handle, &type);
-       if (ACPI_FAILURE(status) || (!device->flags.ejectable) ) {
+       if (ACPI_FAILURE(status) || (!device->flags.ejectable)) {
                ret = -ENODEV;
                goto err;
        }
@@ -476,18 +454,15 @@ acpi_eject_store(struct acpi_device *device, const char *buf, size_t count)
        if (result) {
                ret = -EBUSY;
        }
-err:
+      err:
        return ret;
 }
 
-
 /* --------------------------------------------------------------------------
                               Performance Management
    -------------------------------------------------------------------------- */
 
-static int
-acpi_bus_get_perf_flags (
-       struct acpi_device      *device)
+static int acpi_bus_get_perf_flags(struct acpi_device *device)
 {
        device->performance.state = ACPI_STATE_UNKNOWN;
        return 0;
@@ -500,7 +475,6 @@ acpi_bus_get_perf_flags (
 static LIST_HEAD(acpi_bus_drivers);
 static DECLARE_MUTEX(acpi_bus_drivers_lock);
 
-
 /**
  * acpi_bus_match 
  * --------------
@@ -508,16 +482,13 @@ static DECLARE_MUTEX(acpi_bus_drivers_lock);
  * matches the specified driver's criteria.
  */
 static int
-acpi_bus_match (
-       struct acpi_device      *device,
-       struct acpi_driver      *driver)
+acpi_bus_match(struct acpi_device *device, struct acpi_driver *driver)
 {
        if (driver && driver->ops.match)
                return driver->ops.match(device, driver);
        return acpi_match_ids(device, driver->ids);
 }
 
-
 /**
  * acpi_bus_driver_init 
  * --------------------
@@ -525,11 +496,9 @@ acpi_bus_match (
  * driver is bound to a device.  Invokes the driver's add() and start() ops.
  */
 static int
-acpi_bus_driver_init (
-       struct acpi_device      *device, 
-       struct acpi_driver      *driver)
+acpi_bus_driver_init(struct acpi_device *device, struct acpi_driver *driver)
 {
-       int                     result = 0;
+       int result = 0;
 
        ACPI_FUNCTION_TRACE("acpi_bus_driver_init");
 
@@ -553,13 +522,12 @@ acpi_bus_driver_init (
         * upon possible configuration and currently allocated resources.
         */
 
-       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Driver successfully bound to device\n"));
+       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                         "Driver successfully bound to device\n"));
        return_VALUE(0);
 }
 
-int
-acpi_start_single_object (
-               struct acpi_device *device)
+static int acpi_start_single_object(struct acpi_device *device)
 {
        int result = 0;
        struct acpi_driver *driver;
@@ -578,16 +546,17 @@ acpi_start_single_object (
        return_VALUE(result);
 }
 
-static int acpi_driver_attach(struct acpi_driver * drv)
+static int acpi_driver_attach(struct acpi_driver *drv)
 {
-       struct list_head * node, * next;
+       struct list_head *node, *next;
        int count = 0;
 
        ACPI_FUNCTION_TRACE("acpi_driver_attach");
 
        spin_lock(&acpi_device_lock);
        list_for_each_safe(node, next, &acpi_device_list) {
-               struct acpi_device * dev = container_of(node, struct acpi_device, g_list);
+               struct acpi_device *dev =
+                   container_of(node, struct acpi_device, g_list);
 
                if (dev->driver || !dev->status.present)
                        continue;
@@ -598,7 +567,8 @@ static int acpi_driver_attach(struct acpi_driver * drv)
                                acpi_start_single_object(dev);
                                atomic_inc(&drv->references);
                                count++;
-                               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found driver [%s] for device [%s]\n",
+                               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                                 "Found driver [%s] for device [%s]\n",
                                                  drv->name, dev->pnp.bus_id));
                        }
                }
@@ -608,20 +578,21 @@ static int acpi_driver_attach(struct acpi_driver * drv)
        return_VALUE(count);
 }
 
-static int acpi_driver_detach(struct acpi_driver * drv)
+static int acpi_driver_detach(struct acpi_driver *drv)
 {
-       struct list_head * node, * next;
+       struct list_head *node, *next;
 
        ACPI_FUNCTION_TRACE("acpi_driver_detach");
 
        spin_lock(&acpi_device_lock);
-       list_for_each_safe(node,next,&acpi_device_list) {
-               struct acpi_device * dev = container_of(node,struct acpi_device,g_list);
+       list_for_each_safe(node, next, &acpi_device_list) {
+               struct acpi_device *dev =
+                   container_of(node, struct acpi_device, g_list);
 
                if (dev->driver == drv) {
                        spin_unlock(&acpi_device_lock);
                        if (drv->ops.remove)
-                               drv->ops.remove(dev,ACPI_BUS_REMOVAL_NORMAL);
+                               drv->ops.remove(dev, ACPI_BUS_REMOVAL_NORMAL);
                        spin_lock(&acpi_device_lock);
                        dev->driver = NULL;
                        dev->driver_data = NULL;
@@ -640,9 +611,7 @@ static int acpi_driver_detach(struct acpi_driver * drv)
  * number of devices that were claimed by the driver, or a negative
  * error status for failure.
  */
-int
-acpi_bus_register_driver (
-       struct acpi_driver      *driver)
+int acpi_bus_register_driver(struct acpi_driver *driver)
 {
        int count;
 
@@ -661,8 +630,8 @@ acpi_bus_register_driver (
 
        return_VALUE(count);
 }
-EXPORT_SYMBOL(acpi_bus_register_driver);
 
+EXPORT_SYMBOL(acpi_bus_register_driver);
 
 /**
  * acpi_bus_unregister_driver 
@@ -670,9 +639,7 @@ EXPORT_SYMBOL(acpi_bus_register_driver);
  * Unregisters a driver with the ACPI bus.  Searches the namespace for all
  * devices that match the driver's criteria and unbinds.
  */
-int
-acpi_bus_unregister_driver (
-       struct acpi_driver      *driver)
+int acpi_bus_unregister_driver(struct acpi_driver *driver)
 {
        int error = 0;
 
@@ -685,11 +652,12 @@ acpi_bus_unregister_driver (
                        spin_lock(&acpi_device_lock);
                        list_del_init(&driver->node);
                        spin_unlock(&acpi_device_lock);
-               } 
-       } else 
+               }
+       } else
                error = -EINVAL;
        return_VALUE(error);
 }
+
 EXPORT_SYMBOL(acpi_bus_unregister_driver);
 
 /**
@@ -698,18 +666,17 @@ EXPORT_SYMBOL(acpi_bus_unregister_driver);
  * Parses the list of registered drivers looking for a driver applicable for
  * the specified device.
  */
-static int
-acpi_bus_find_driver (
-       struct acpi_device      *device)
+static int acpi_bus_find_driver(struct acpi_device *device)
 {
-       int                     result = 0;
-       struct list_head        * node, *next;
+       int result = 0;
+       struct list_head *node, *next;
 
        ACPI_FUNCTION_TRACE("acpi_bus_find_driver");
 
        spin_lock(&acpi_device_lock);
-       list_for_each_safe(node,next,&acpi_bus_drivers) {
-               struct acpi_driver * driver = container_of(node,struct acpi_driver,node);
+       list_for_each_safe(node, next, &acpi_bus_drivers) {
+               struct acpi_driver *driver =
+                   container_of(node, struct acpi_driver, node);
 
                atomic_inc(&driver->references);
                spin_unlock(&acpi_device_lock);
@@ -723,21 +690,18 @@ acpi_bus_find_driver (
        }
        spin_unlock(&acpi_device_lock);
 
- Done:
     Done:
        return_VALUE(result);
 }
 
-
 /* --------------------------------------------------------------------------
                                  Device Enumeration
    -------------------------------------------------------------------------- */
 
-static int 
-acpi_bus_get_flags (
-       struct acpi_device      *device)
+static int acpi_bus_get_flags(struct acpi_device *device)
 {
-       acpi_status             status = AE_OK;
-       acpi_handle             temp = NULL;
+       acpi_status status = AE_OK;
+       acpi_handle temp = NULL;
 
        ACPI_FUNCTION_TRACE("acpi_bus_get_flags");
 
@@ -788,11 +752,12 @@ acpi_bus_get_flags (
        return_VALUE(0);
 }
 
-static void acpi_device_get_busid(struct acpi_device * device, acpi_handle handle, int type)
+static void acpi_device_get_busid(struct acpi_device *device,
+                                 acpi_handle handle, int type)
 {
-       char                    bus_id[5] = {'?',0};
-       struct acpi_buffer      buffer = {sizeof(bus_id), bus_id};
-       int                     i = 0;
+       char bus_id[5] = { '?', 0 };
+       struct acpi_buffer buffer = { sizeof(bus_id), bus_id };
+       int i = 0;
 
        /*
         * Bus ID
@@ -824,21 +789,22 @@ static void acpi_device_get_busid(struct acpi_device * device, acpi_handle handl
        }
 }
 
-static void acpi_device_set_id(struct acpi_device * device, struct acpi_device * parent,
-                              acpi_handle handle, int type)
+static void acpi_device_set_id(struct acpi_device *device,
+                              struct acpi_device *parent, acpi_handle handle,
+                              int type)
 {
-       struct acpi_device_info *info;
-       struct acpi_buffer      buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-       char                    *hid = NULL;
-       char                    *uid = NULL;
+       struct acpi_device_info *info;
+       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+       char *hid = NULL;
+       char *uid = NULL;
        struct acpi_compatible_id_list *cid_list = NULL;
-       acpi_status             status;
+       acpi_status status;
 
        switch (type) {
        case ACPI_BUS_TYPE_DEVICE:
                status = acpi_get_object_info(handle, &buffer);
                if (ACPI_FAILURE(status)) {
-                       printk("%s: Error reading device info\n",__FUNCTION__);
+                       printk("%s: Error reading device info\n", __FUNCTION__);
                        return;
                }
 
@@ -904,7 +870,7 @@ static void acpi_device_set_id(struct acpi_device * device, struct acpi_device *
        acpi_os_free(buffer.pointer);
 }
 
-static int acpi_device_set_context(struct acpi_device * device, int type)
+static int acpi_device_set_context(struct acpi_device *device, int type)
 {
        acpi_status status = AE_OK;
        int result = 0;
@@ -916,10 +882,10 @@ static int acpi_device_set_context(struct acpi_device * device, int type)
         * to be careful with fixed-feature devices as they all attach to the
         * root object.
         */
-       if (type != ACPI_BUS_TYPE_POWER_BUTTON && 
+       if (type != ACPI_BUS_TYPE_POWER_BUTTON &&
            type != ACPI_BUS_TYPE_SLEEP_BUTTON) {
                status = acpi_attach_data(device->handle,
-                       acpi_bus_data_handler, device);
+                                         acpi_bus_data_handler, device);
 
                if (ACPI_FAILURE(status)) {
                        printk("Error attaching device data\n");
@@ -929,12 +895,13 @@ static int acpi_device_set_context(struct acpi_device * device, int type)
        return result;
 }
 
-static void acpi_device_get_debug_info(struct acpi_device * device, acpi_handle handle, int type)
+static void acpi_device_get_debug_info(struct acpi_device *device,
+                                      acpi_handle handle, int type)
 {
 #ifdef CONFIG_ACPI_DEBUG_OUTPUT
-       char            *type_string = NULL;
-       char            name[80] = {'?','\0'};
-       struct acpi_buffer      buffer = {sizeof(name), name};
+       char *type_string = NULL;
+       char name[80] = { '?', '\0' };
+       struct acpi_buffer buffer = { sizeof(name), name };
 
        switch (type) {
        case ACPI_BUS_TYPE_DEVICE:
@@ -968,18 +935,14 @@ static void acpi_device_get_debug_info(struct acpi_device * device, acpi_handle
        }
 
        printk(KERN_DEBUG "Found %s %s [%p]\n", type_string, name, handle);
-#endif /*CONFIG_ACPI_DEBUG_OUTPUT*/
+#endif                         /*CONFIG_ACPI_DEBUG_OUTPUT */
 }
 
-
-static int
-acpi_bus_remove (
-       struct acpi_device *dev,
-       int rmdevice)
+static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)
 {
-       int                     result = 0;
-       struct acpi_driver      *driver;
-       
+       int result = 0;
+       struct acpi_driver *driver;
+
        ACPI_FUNCTION_TRACE("acpi_bus_remove");
 
        if (!dev)
@@ -1012,22 +975,18 @@ acpi_bus_remove (
                if ((dev->parent) && (dev->parent->ops.unbind))
                        dev->parent->ops.unbind(dev);
        }
-       
+
        acpi_device_unregister(dev, ACPI_BUS_REMOVAL_EJECT);
 
        return_VALUE(0);
 }
 
-
 static int
-acpi_add_single_object (
-       struct acpi_device      **child,
-       struct acpi_device      *parent,
-       acpi_handle             handle,
-       int                     type)
+acpi_add_single_object(struct acpi_device **child,
+                      struct acpi_device *parent, acpi_handle handle, int type)
 {
-       int                     result = 0;
-       struct acpi_device      *device = NULL;
+       int result = 0;
+       struct acpi_device *device = NULL;
 
        ACPI_FUNCTION_TRACE("acpi_add_single_object");
 
@@ -1044,7 +1003,7 @@ acpi_add_single_object (
        device->handle = handle;
        device->parent = parent;
 
-       acpi_device_get_busid(device,handle,type);
+       acpi_device_get_busid(device, handle, type);
 
        /*
         * Flags
@@ -1092,7 +1051,7 @@ acpi_add_single_object (
         * Hardware ID, Unique ID, & Bus Address
         * -------------------------------------
         */
-       acpi_device_set_id(device,parent,handle,type);
+       acpi_device_set_id(device, parent, handle, type);
 
        /*
         * Power Management
@@ -1104,7 +1063,7 @@ acpi_add_single_object (
                        goto end;
        }
 
-       /*
+       /*
         * Wakeup device management
         *-----------------------
         */
@@ -1124,12 +1083,12 @@ acpi_add_single_object (
                        goto end;
        }
 
-       if ((result = acpi_device_set_context(device,type)))
+       if ((result = acpi_device_set_context(device, type)))
                goto end;
 
-       acpi_device_get_debug_info(device,handle,type);
+       acpi_device_get_debug_info(device, handle, type);
 
-       acpi_device_register(device,parent);
+       acpi_device_register(device, parent);
 
        /*
         * Bind _ADR-Based Devices
@@ -1154,7 +1113,7 @@ acpi_add_single_object (
         */
        result = acpi_bus_find_driver(device);
 
-end:
+      end:
        if (!result)
                *child = device;
        else {
@@ -1166,17 +1125,15 @@ end:
        return_VALUE(result);
 }
 
-
-static int acpi_bus_scan (struct acpi_device   *start,
-               struct acpi_bus_ops *ops)
+static int acpi_bus_scan(struct acpi_device *start, struct acpi_bus_ops *ops)
 {
-       acpi_status             status = AE_OK;
-       struct acpi_device      *parent = NULL;
-       struct acpi_device      *child = NULL;
-       acpi_handle             phandle = NULL;
-       acpi_handle             chandle = NULL;
-       acpi_object_type        type = 0;
-       u32                     level = 1;
+       acpi_status status = AE_OK;
+       struct acpi_device *parent = NULL;
+       struct acpi_device *child = NULL;
+       acpi_handle phandle = NULL;
+       acpi_handle chandle = NULL;
+       acpi_object_type type = 0;
+       u32 level = 1;
 
        ACPI_FUNCTION_TRACE("acpi_bus_scan");
 
@@ -1185,7 +1142,7 @@ static int acpi_bus_scan (struct acpi_device      *start,
 
        parent = start;
        phandle = start->handle;
-       
+
        /*
         * Parse through the ACPI namespace, identify all 'devices', and
         * create a new 'struct acpi_device' for each.
@@ -1193,7 +1150,7 @@ static int acpi_bus_scan (struct acpi_device      *start,
        while ((level > 0) && parent) {
 
                status = acpi_get_next_object(ACPI_TYPE_ANY, phandle,
-                       chandle, &chandle);
+                                             chandle, &chandle);
 
                /*
                 * If this scope is exhausted then move our way back up.
@@ -1243,12 +1200,12 @@ static int acpi_bus_scan (struct acpi_device    *start,
 
                if (ops->acpi_op_add)
                        status = acpi_add_single_object(&child, parent,
-                                       chandle, type);
-                else
+                                                       chandle, type);
+               else
                        status = acpi_bus_get_device(chandle, &child);
 
-                if (ACPI_FAILURE(status))
-                        continue;
+               if (ACPI_FAILURE(status))
+                       continue;
 
                if (ops->acpi_op_start) {
                        status = acpi_start_single_object(child);
@@ -1264,7 +1221,7 @@ static int acpi_bus_scan (struct acpi_device      *start,
                 * which will be enumerated when the parent is inserted).
                 *
                 * TBD: Need notifications and other detection mechanisms
-                *      in place before we can fully implement this.
+                *      in place before we can fully implement this.
                 */
                if (child->status.present) {
                        status = acpi_get_next_object(ACPI_TYPE_ANY, chandle,
@@ -1282,11 +1239,8 @@ static int acpi_bus_scan (struct acpi_device     *start,
 }
 
 int
-acpi_bus_add (
-       struct acpi_device      **child,
-       struct acpi_device      *parent,
-       acpi_handle             handle,
-       int                     type)
+acpi_bus_add(struct acpi_device **child,
+            struct acpi_device *parent, acpi_handle handle, int type)
 {
        int result;
        struct acpi_bus_ops ops;
@@ -1301,11 +1255,10 @@ acpi_bus_add (
        }
        return_VALUE(result);
 }
+
 EXPORT_SYMBOL(acpi_bus_add);
 
-int
-acpi_bus_start (
-       struct acpi_device *device)
+int acpi_bus_start(struct acpi_device *device)
 {
        int result;
        struct acpi_bus_ops ops;
@@ -1323,26 +1276,25 @@ acpi_bus_start (
        }
        return_VALUE(result);
 }
+
 EXPORT_SYMBOL(acpi_bus_start);
 
-static int
-acpi_bus_trim(struct acpi_device       *start,
-               int rmdevice)
+static int acpi_bus_trim(struct acpi_device *start, int rmdevice)
 {
-       acpi_status             status;
-       struct acpi_device      *parent, *child;
-       acpi_handle             phandle, chandle;
-       acpi_object_type        type;
-       u32                     level = 1;
-       int                     err = 0;
-
-       parent  = start;
+       acpi_status status;
+       struct acpi_device *parent, *child;
+       acpi_handle phandle, chandle;
+       acpi_object_type type;
+       u32 level = 1;
+       int err = 0;
+
+       parent = start;
        phandle = start->handle;
        child = chandle = NULL;
 
        while ((level > 0) && parent && (!err)) {
                status = acpi_get_next_object(ACPI_TYPE_ANY, phandle,
-                       chandle, &chandle);
+                                             chandle, &chandle);
 
                /*
                 * If this scope is exhausted then move our way back up.
@@ -1381,12 +1333,10 @@ acpi_bus_trim(struct acpi_device        *start,
        return err;
 }
 
-static int
-acpi_bus_scan_fixed (
-       struct acpi_device      *root)
+static int acpi_bus_scan_fixed(struct acpi_device *root)
 {
-       int                     result = 0;
-       struct acpi_device      *device = NULL;
+       int result = 0;
+       struct acpi_device *device = NULL;
 
        ACPI_FUNCTION_TRACE("acpi_bus_scan_fixed");
 
@@ -1398,14 +1348,16 @@ acpi_bus_scan_fixed (
         */
        if (acpi_fadt.pwr_button == 0) {
                result = acpi_add_single_object(&device, acpi_root,
-                       NULL, ACPI_BUS_TYPE_POWER_BUTTON);
+                                               NULL,
+                                               ACPI_BUS_TYPE_POWER_BUTTON);
                if (!result)
                        result = acpi_start_single_object(device);
        }
 
        if (acpi_fadt.sleep_button == 0) {
                result = acpi_add_single_object(&device, acpi_root,
-                       NULL, ACPI_BUS_TYPE_SLEEP_BUTTON);
+                                               NULL,
+                                               ACPI_BUS_TYPE_SLEEP_BUTTON);
                if (!result)
                        result = acpi_start_single_object(device);
        }
@@ -1413,7 +1365,6 @@ acpi_bus_scan_fixed (
        return_VALUE(result);
 }
 
-
 static int __init acpi_scan_init(void)
 {
        int result;
@@ -1430,7 +1381,7 @@ static int __init acpi_scan_init(void)
         * Create the root device in the bus's device tree
         */
        result = acpi_add_single_object(&acpi_root, NULL, ACPI_ROOT_OBJECT,
-               ACPI_BUS_TYPE_SYSTEM);
+                                       ACPI_BUS_TYPE_SYSTEM);
        if (result)
                goto Done;
 
@@ -1450,7 +1401,7 @@ static int __init acpi_scan_init(void)
        if (result)
                acpi_device_unregister(acpi_root, ACPI_BUS_REMOVAL_NORMAL);
 
- Done:
     Done:
        return_VALUE(result);
 }