Pull misc into release branch
This commit is contained in:
commit
a4fd494621
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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';
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue