Pull misc into release branch
authorLen Brown <len.brown@intel.com>
Sat, 25 Aug 2007 05:40:27 +0000 (01:40 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 25 Aug 2007 05:40:27 +0000 (01:40 -0400)
drivers/acpi/namespace/nsxfeval.c
drivers/acpi/scan.c
drivers/acpi/sleep/main.c
drivers/acpi/utilities/utglobal.c
drivers/pci/hotplug/acpiphp_ibm.c
include/acpi/acpixf.h
include/acpi/acstruct.h

index ab65b2c2560ec5901c743245d73716683093b070..f39fbc6b9237687a3ffd0c1b387499bb6ad0714c 100644 (file)
@@ -540,7 +540,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
  ******************************************************************************/
 
 acpi_status
-acpi_get_devices(char *HID,
+acpi_get_devices(const char *HID,
                 acpi_walk_callback user_function,
                 void *context, void **return_value)
 {
index be74347d135435e5c5b4508b8144528bc58a0459..64620d668742ea8cb3345c0a07d415e96268a3bf 100644 (file)
@@ -35,8 +35,9 @@ struct acpi_device_bus_id{
  * e.g. on a device with hid:IBM0001 and cid:ACPI0001 you get:
  * char *modalias: "acpi:IBM0001:ACPI0001"
 */
-int create_modalias(struct acpi_device *acpi_dev, char *modalias, int size){
-
+static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
+                          int size)
+{
        int len;
 
        if (!acpi_dev->flags.hardware_id)
index e8cff5dd4cbc8ba20cda8260825bff32122f4cbe..c52ade816fb494768000d11cfb0b277c37483071 100644 (file)
@@ -305,7 +305,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p)
        unsigned long d_min, d_max;
 
        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
-               printk(KERN_ERR "ACPI handle has no context!\n");
+               printk(KERN_DEBUG "ACPI handle has no context!\n");
                return -ENODEV;
        }
 
index 1621655d6e2b331e23bd9beaf56e59fab7298e8d..93ea8290b4f741d68986bce4f3d38ba9cf18983c 100644 (file)
@@ -126,6 +126,7 @@ const char *acpi_format_exception(acpi_status status)
                            "Unknown exception code: 0x%8.8X", status));
 
                exception = "UNKNOWN_STATUS_CODE";
+               dump_stack();
        }
 
        return (ACPI_CAST_PTR(const char, exception));
index 70db38c0ced9f6586ed6356e4bc8ef78c6cd4235..80544d87437b1f19aff81fefe1aacb6efe44134e 100644 (file)
@@ -399,7 +399,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
 
        status = acpi_get_object_info(handle, &info_buffer);
        if (ACPI_FAILURE(status)) {
-               err("%s:  Failed to get device information", __FUNCTION__);
+               err("%s:  Failed to get device information\n", __FUNCTION__);
                return 0;
        }
        info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0';
index b5cca5daa348802e25426990f9e290db9d3621f9..3d7ab9e0c9fe2e93dacda51f409b65cbe5a0bb3f 100644 (file)
@@ -130,7 +130,7 @@ acpi_walk_namespace(acpi_object_type type,
                    void *context, void **return_value);
 
 acpi_status
-acpi_get_devices(char *HID,
+acpi_get_devices(const char *HID,
                 acpi_walk_callback user_function,
                 void *context, void **return_value);
 
index aeb4498e5e06047b52ea521e2a8ad69cb3428630..88482655407f04fce85d9a35baa3ad8e1b17b624 100644 (file)
@@ -146,7 +146,7 @@ struct acpi_init_walk_info {
 struct acpi_get_devices_info {
        acpi_walk_callback user_function;
        void *context;
-       char *hid;
+       const char *hid;
 };
 
 union acpi_aml_operands {