ACPI: add missing KERN_* constants to printks
According to kerneljanitors todo list all printk calls (beginning a new line) should have an according KERN_* constant. Those are the missing peaces here for the acpi subsystem. Signed-off-by: Frank Seidel <frank@f-seidel.de> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
ae1a25da84
commit
4d9391557b
6 changed files with 12 additions and 11 deletions
|
@ -163,7 +163,7 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)
|
|||
case ACPI_NOTIFY_BUS_CHECK:
|
||||
/* Fall through */
|
||||
case ACPI_NOTIFY_DEVICE_CHECK:
|
||||
printk("Container driver received %s event\n",
|
||||
printk(KERN_WARNING "Container driver received %s event\n",
|
||||
(type == ACPI_NOTIFY_BUS_CHECK) ?
|
||||
"ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK");
|
||||
status = acpi_bus_get_device(handle, &device);
|
||||
|
@ -174,7 +174,8 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)
|
|||
kobject_uevent(&device->dev.kobj,
|
||||
KOBJ_ONLINE);
|
||||
else
|
||||
printk("Failed to add container\n");
|
||||
printk(KERN_WARNING
|
||||
"Failed to add container\n");
|
||||
}
|
||||
} else {
|
||||
if (ACPI_SUCCESS(status)) {
|
||||
|
|
|
@ -984,7 +984,7 @@ static int dock_add(acpi_handle handle)
|
|||
|
||||
ret = device_create_file(&dock_device->dev, &dev_attr_docked);
|
||||
if (ret) {
|
||||
printk("Error %d adding sysfs file\n", ret);
|
||||
printk(KERN_ERR "Error %d adding sysfs file\n", ret);
|
||||
platform_device_unregister(dock_device);
|
||||
kfree(dock_station);
|
||||
dock_station = NULL;
|
||||
|
@ -992,7 +992,7 @@ static int dock_add(acpi_handle handle)
|
|||
}
|
||||
ret = device_create_file(&dock_device->dev, &dev_attr_undock);
|
||||
if (ret) {
|
||||
printk("Error %d adding sysfs file\n", ret);
|
||||
printk(KERN_ERR "Error %d adding sysfs file\n", ret);
|
||||
device_remove_file(&dock_device->dev, &dev_attr_docked);
|
||||
platform_device_unregister(dock_device);
|
||||
kfree(dock_station);
|
||||
|
@ -1001,7 +1001,7 @@ static int dock_add(acpi_handle handle)
|
|||
}
|
||||
ret = device_create_file(&dock_device->dev, &dev_attr_uid);
|
||||
if (ret) {
|
||||
printk("Error %d adding sysfs file\n", ret);
|
||||
printk(KERN_ERR "Error %d adding sysfs file\n", ret);
|
||||
device_remove_file(&dock_device->dev, &dev_attr_docked);
|
||||
device_remove_file(&dock_device->dev, &dev_attr_undock);
|
||||
platform_device_unregister(dock_device);
|
||||
|
@ -1011,7 +1011,7 @@ static int dock_add(acpi_handle handle)
|
|||
}
|
||||
ret = device_create_file(&dock_device->dev, &dev_attr_flags);
|
||||
if (ret) {
|
||||
printk("Error %d adding sysfs file\n", ret);
|
||||
printk(KERN_ERR "Error %d adding sysfs file\n", ret);
|
||||
device_remove_file(&dock_device->dev, &dev_attr_docked);
|
||||
device_remove_file(&dock_device->dev, &dev_attr_undock);
|
||||
device_remove_file(&dock_device->dev, &dev_attr_uid);
|
||||
|
|
|
@ -228,10 +228,10 @@ void acpi_os_vprintf(const char *fmt, va_list args)
|
|||
if (acpi_in_debugger) {
|
||||
kdb_printf("%s", buffer);
|
||||
} else {
|
||||
printk("%s", buffer);
|
||||
printk(KERN_CONT "%s", buffer);
|
||||
}
|
||||
#else
|
||||
printk("%s", buffer);
|
||||
printk(KERN_CONT "%s", buffer);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -593,7 +593,7 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
|
|||
return -ENODEV;
|
||||
} else {
|
||||
acpi_irq_penalty[link->irq.active] += PIRQ_PENALTY_PCI_USING;
|
||||
printk(PREFIX "%s [%s] enabled at IRQ %d\n",
|
||||
printk(KERN_WARNING PREFIX "%s [%s] enabled at IRQ %d\n",
|
||||
acpi_device_name(link->device),
|
||||
acpi_device_bid(link->device), link->irq.active);
|
||||
}
|
||||
|
|
|
@ -679,7 +679,7 @@ static void acpi_power_off_prepare(void)
|
|||
static void acpi_power_off(void)
|
||||
{
|
||||
/* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
|
||||
printk("%s called\n", __func__);
|
||||
printk(KERN_DEBUG "%s called\n", __func__);
|
||||
local_irq_disable();
|
||||
acpi_enable_wakeup_device(ACPI_STATE_S5);
|
||||
acpi_enter_sleep_state(ACPI_STATE_S5);
|
||||
|
|
|
@ -1260,7 +1260,7 @@ static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)
|
|||
printk(KERN_WARNING PREFIX
|
||||
"This indicates a BIOS bug. Please contact the manufacturer.\n");
|
||||
}
|
||||
printk("%llx\n", options);
|
||||
printk(KERN_WARNING "%llx\n", options);
|
||||
seq_printf(seq, "can POST: <integrated video>");
|
||||
if (options & 2)
|
||||
seq_printf(seq, " <PCI video>");
|
||||
|
|
Loading…
Reference in a new issue