diff options
| author | Len Brown <len.brown@intel.com> | 2007-08-25 01:40:27 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-08-25 01:40:27 -0400 |
| commit | a4fd4946214fae86610b989c47e5ae762cc96ddb (patch) | |
| tree | 67ae652556f3b0eb785ffb1a2d793996886052f5 /drivers | |
| parent | a3a1b26e79db743c3289632238cd5f930f91bf27 (diff) | |
| parent | 5e1f198bbfcffa1e3b9091b4ca7032c2d07fde81 (diff) | |
| download | linux-3.10-a4fd4946214fae86610b989c47e5ae762cc96ddb.tar.gz linux-3.10-a4fd4946214fae86610b989c47e5ae762cc96ddb.tar.bz2 linux-3.10-a4fd4946214fae86610b989c47e5ae762cc96ddb.zip | |
Pull misc into release branch
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/namespace/nsxfeval.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/scan.c | 5 | ||||
| -rw-r--r-- | drivers/acpi/sleep/main.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/utilities/utglobal.c | 1 | ||||
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_ibm.c | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c index ab65b2c2560..f39fbc6b923 100644 --- a/drivers/acpi/namespace/nsxfeval.c +++ b/drivers/acpi/namespace/nsxfeval.c @@ -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) { diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index be74347d135..64620d66874 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -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) diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index e8cff5dd4cb..c52ade816fb 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c @@ -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; } diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c index 1621655d6e2..93ea8290b4f 100644 --- a/drivers/acpi/utilities/utglobal.c +++ b/drivers/acpi/utilities/utglobal.c @@ -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)); diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c index 70db38c0ced..80544d87437 100644 --- a/drivers/pci/hotplug/acpiphp_ibm.c +++ b/drivers/pci/hotplug/acpiphp_ibm.c @@ -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'; |