aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-05-08 11:24:20 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-08 11:55:26 -0400
commitbe96447e0d49622fe00b07474f9a86805d389ca7 (patch)
tree0654f56039cf345f6fda875a50f93cfedd272e07 /drivers/acpi
parent2c03ead66a2f0f39c38a455891b749ad48a2e1a7 (diff)
acpi: use KERN_CONT in printk() continuation lines
Cc: Len Brown <lenb@kernel.org> Signed-off-by: Kay Sievers <kay@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/pci_link.c12
-rw-r--r--drivers/acpi/sleep.c8
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 4a29763b8eb4..a12808259dfb 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -720,21 +720,21 @@ static int acpi_pci_link_add(struct acpi_device *device)
720 acpi_device_bid(device)); 720 acpi_device_bid(device));
721 for (i = 0; i < link->irq.possible_count; i++) { 721 for (i = 0; i < link->irq.possible_count; i++) {
722 if (link->irq.active == link->irq.possible[i]) { 722 if (link->irq.active == link->irq.possible[i]) {
723 printk(" *%d", link->irq.possible[i]); 723 printk(KERN_CONT " *%d", link->irq.possible[i]);
724 found = 1; 724 found = 1;
725 } else 725 } else
726 printk(" %d", link->irq.possible[i]); 726 printk(KERN_CONT " %d", link->irq.possible[i]);
727 } 727 }
728 728
729 printk(")"); 729 printk(KERN_CONT ")");
730 730
731 if (!found) 731 if (!found)
732 printk(" *%d", link->irq.active); 732 printk(KERN_CONT " *%d", link->irq.active);
733 733
734 if (!link->device->status.enabled) 734 if (!link->device->status.enabled)
735 printk(", disabled."); 735 printk(KERN_CONT ", disabled.");
736 736
737 printk("\n"); 737 printk(KERN_CONT "\n");
738 738
739 list_add_tail(&link->list, &acpi_link_list); 739 list_add_tail(&link->list, &acpi_link_list);
740 740
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index eb6fd233764b..06527c526618 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -887,7 +887,7 @@ int __init acpi_sleep_init(void)
887 status = acpi_get_sleep_type_data(i, &type_a, &type_b); 887 status = acpi_get_sleep_type_data(i, &type_a, &type_b);
888 if (ACPI_SUCCESS(status)) { 888 if (ACPI_SUCCESS(status)) {
889 sleep_states[i] = 1; 889 sleep_states[i] = 1;
890 printk(" S%d", i); 890 printk(KERN_CONT " S%d", i);
891 } 891 }
892 } 892 }
893 893
@@ -901,7 +901,7 @@ int __init acpi_sleep_init(void)
901 hibernation_set_ops(old_suspend_ordering ? 901 hibernation_set_ops(old_suspend_ordering ?
902 &acpi_hibernation_ops_old : &acpi_hibernation_ops); 902 &acpi_hibernation_ops_old : &acpi_hibernation_ops);
903 sleep_states[ACPI_STATE_S4] = 1; 903 sleep_states[ACPI_STATE_S4] = 1;
904 printk(" S4"); 904 printk(KERN_CONT " S4");
905 if (!nosigcheck) { 905 if (!nosigcheck) {
906 acpi_get_table(ACPI_SIG_FACS, 1, 906 acpi_get_table(ACPI_SIG_FACS, 1,
907 (struct acpi_table_header **)&facs); 907 (struct acpi_table_header **)&facs);
@@ -914,11 +914,11 @@ int __init acpi_sleep_init(void)
914 status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b); 914 status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
915 if (ACPI_SUCCESS(status)) { 915 if (ACPI_SUCCESS(status)) {
916 sleep_states[ACPI_STATE_S5] = 1; 916 sleep_states[ACPI_STATE_S5] = 1;
917 printk(" S5"); 917 printk(KERN_CONT " S5");
918 pm_power_off_prepare = acpi_power_off_prepare; 918 pm_power_off_prepare = acpi_power_off_prepare;
919 pm_power_off = acpi_power_off; 919 pm_power_off = acpi_power_off;
920 } 920 }
921 printk(")\n"); 921 printk(KERN_CONT ")\n");
922 /* 922 /*
923 * Register the tts_notifier to reboot notifier list so that the _TTS 923 * Register the tts_notifier to reboot notifier list so that the _TTS
924 * object can also be evaluated when the system enters S5. 924 * object can also be evaluated when the system enters S5.