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

Commit be96447e authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

acpi: use KERN_CONT in printk() continuation lines



Cc: Len Brown <lenb@kernel.org>
Signed-off-by: default avatarKay Sievers <kay@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2c03ead6
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -720,21 +720,21 @@ static int acpi_pci_link_add(struct acpi_device *device)
	       acpi_device_bid(device));
	for (i = 0; i < link->irq.possible_count; i++) {
		if (link->irq.active == link->irq.possible[i]) {
			printk(" *%d", link->irq.possible[i]);
			printk(KERN_CONT " *%d", link->irq.possible[i]);
			found = 1;
		} else
			printk(" %d", link->irq.possible[i]);
			printk(KERN_CONT " %d", link->irq.possible[i]);
	}

	printk(")");
	printk(KERN_CONT ")");

	if (!found)
		printk(" *%d", link->irq.active);
		printk(KERN_CONT " *%d", link->irq.active);

	if (!link->device->status.enabled)
		printk(", disabled.");
		printk(KERN_CONT ", disabled.");

	printk("\n");
	printk(KERN_CONT "\n");

	list_add_tail(&link->list, &acpi_link_list);

+4 −4
Original line number Diff line number Diff line
@@ -887,7 +887,7 @@ int __init acpi_sleep_init(void)
		status = acpi_get_sleep_type_data(i, &type_a, &type_b);
		if (ACPI_SUCCESS(status)) {
			sleep_states[i] = 1;
			printk(" S%d", i);
			printk(KERN_CONT " S%d", i);
		}
	}

@@ -901,7 +901,7 @@ int __init acpi_sleep_init(void)
		hibernation_set_ops(old_suspend_ordering ?
			&acpi_hibernation_ops_old : &acpi_hibernation_ops);
		sleep_states[ACPI_STATE_S4] = 1;
		printk(" S4");
		printk(KERN_CONT " S4");
		if (!nosigcheck) {
			acpi_get_table(ACPI_SIG_FACS, 1,
				(struct acpi_table_header **)&facs);
@@ -914,11 +914,11 @@ int __init acpi_sleep_init(void)
	status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
	if (ACPI_SUCCESS(status)) {
		sleep_states[ACPI_STATE_S5] = 1;
		printk(" S5");
		printk(KERN_CONT " S5");
		pm_power_off_prepare = acpi_power_off_prepare;
		pm_power_off = acpi_power_off;
	}
	printk(")\n");
	printk(KERN_CONT ")\n");
	/*
	 * Register the tts_notifier to reboot notifier list so that the _TTS
	 * object can also be evaluated when the system enters S5.