lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pull misc into release branch

Browse Source
This commit is contained in:
Len Brown
2007-08-25 01:40:27 -04:00
parent a3a1b26e79 5e1f198bbf
commit a4fd494621
7 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/namespace/nsxfeval.c
View File

@@ -540,7 +540,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
******************************************************************************/ ******************************************************************************/
acpi_status acpi_status
acpi_get_devices(char *HID, acpi_get_devices(const char *HID,
acpi_walk_callback user_function, acpi_walk_callback user_function,
void *context, void **return_value) void *context, void **return_value)
{ {

5
drivers/acpi/scan.c
View File

@@ -35,8 +35,9 @@ struct acpi_device_bus_id{
* e.g. on a device with hid:IBM0001 and cid:ACPI0001 you get: * e.g. on a device with hid:IBM0001 and cid:ACPI0001 you get:
* char *modalias: "acpi:IBM0001:ACPI0001" * 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; int len;
if (!acpi_dev->flags.hardware_id) if (!acpi_dev->flags.hardware_id)

2
drivers/acpi/sleep/main.c
View 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; unsigned long d_min, d_max;
if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) { 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; return -ENODEV;
} }

1
drivers/acpi/utilities/utglobal.c
View File

@@ -126,6 +126,7 @@ const char *acpi_format_exception(acpi_status status)
"Unknown exception code: 0x%8.8X", status)); "Unknown exception code: 0x%8.8X", status));
exception = "UNKNOWN_STATUS_CODE"; exception = "UNKNOWN_STATUS_CODE";
dump_stack();
} }
return (ACPI_CAST_PTR(const char, exception)); return (ACPI_CAST_PTR(const char, exception));

2
drivers/pci/hotplug/acpiphp_ibm.c
View File

@@ -399,7 +399,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
status = acpi_get_object_info(handle, &info_buffer); status = acpi_get_object_info(handle, &info_buffer);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
err("%s: Failed to get device information", __FUNCTION__); err("%s: Failed to get device information\n", __FUNCTION__);
return 0; return 0;
} }
info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0'; info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0';

2
include/acpi/acpixf.h
View File

@@ -130,7 +130,7 @@ acpi_walk_namespace(acpi_object_type type,
void *context, void **return_value); void *context, void **return_value);
acpi_status acpi_status
acpi_get_devices(char *HID, acpi_get_devices(const char *HID,
acpi_walk_callback user_function, acpi_walk_callback user_function,
void *context, void **return_value); void *context, void **return_value);

2
include/acpi/acstruct.h
View File

@@ -146,7 +146,7 @@ struct acpi_init_walk_info {
struct acpi_get_devices_info { struct acpi_get_devices_info {
acpi_walk_callback user_function; acpi_walk_callback user_function;
void *context; void *context;
char *hid; const char *hid;
}; };
union acpi_aml_operands { union acpi_aml_operands {