Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d939155 authored by Frank Seidel's avatar Frank Seidel Committed by Len Brown
Browse files

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: default avatarFrank Seidel <frank@f-seidel.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent ae1a25da

drivers/acpi/container.c

+3 −2
Original line number Diff line number Diff line
@@ -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)) {

drivers/acpi/dock.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

drivers/acpi/osl.c

+2 −2
Original line number Diff line number Diff line
@@ -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

}

drivers/acpi/pci_link.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

drivers/acpi/sleep.c

+1 −1
Original line number Diff line number Diff line
@@ -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);