acpi: use KERN_CONT in printk() continuation lines
PATCH 1/1 acpi: use KERN_CONT in printk() continuation lines
From: Kay Sievers <[email protected]>
Subject: acpi: use KERN_CONT in printk() continuation lines
Cc Len Brown <[email protected]>
Signed-off-by Kay Sievers <[email protected]>
--- drivers/acpi/pci_link.c | 12 ++++++------ drivers/acpi/sleep.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-)
drivers/acpi/pci_link.c +6 -6
@@ -720,21 +720,21 @@ static int acpi_pci_link_add(struct acpi 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);
drivers/acpi/sleep.c +4 -4
@@ -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.
also need attached ones for scsi/lsi mpt2sas and ioapic debug printout
you may search and fix them all.
Thanks
Yinghai
--- drivers/scsi/mpt2sas/mpt2sas_base.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/scsi/mpt2sas/mpt2sas_base.c +15 -15
@@ -2085,79 +2085,79 @@ _base_display_ioc_capabilities(struct MPprintk (MPT2SAS_INFO_FMT "Protocol=(" , ioc->name);if (ioc->facts.ProtocolFlags &MPI2_IOCFACTS_PROTOCOL_SCSI_INITIATOR ) { -printk ("Initiator" ); +printk (KERN_CONT "Initiator" ); i++; }if (ioc->facts.ProtocolFlags &MPI2_IOCFACTS_PROTOCOL_SCSI_TARGET ) { -printk ("%sTarget" , i ?"," :"" ); +printk (KERN_CONT "%sTarget" , i ?"," :"" ); i++; } i =0 ; -printk ("), " ); -printk ("Capabilities=(" ); +printk (KERN_CONT "), " ); +printk (KERN_CONT "Capabilities=(" );if (!ioc->hide_ir_msg) {if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_INTEGRATED_RAID ) { -printk ("Raid" ); +printk (KERN_CONT "Raid" ); i++; } }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_TLR ) { -printk ("%sTLR" , i ?"," :"" ); +printk (KERN_CONT "%sTLR" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_MULTICAST ) { -printk ("%sMulticast" , i ?"," :"" ); +printk (KERN_CONT "%sMulticast" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_BIDIRECTIONAL_TARGET ) { -printk ("%sBIDI Target" , i ?"," :"" ); +printk (KERN_CONT "%sBIDI Target" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_EEDP ) { -printk ("%sEEDP" , i ?"," :"" ); +printk (KERN_CONT "%sEEDP" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_SNAPSHOT_BUFFER ) { -printk ("%sSnapshot Buffer" , i ?"," :"" ); +printk (KERN_CONT "%sSnapshot Buffer" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_DIAG_TRACE_BUFFER ) { -printk ("%sDiag Trace Buffer" , i ?"," :"" ); +printk (KERN_CONT "%sDiag Trace Buffer" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_EXTENDED_BUFFER ) { -printk (KERN_INFO "%sDiag Extended Buffer" , i ?"," :"" ); +printk (KERN_CONT "%sDiag Extended Buffer" , i ?"," :"" ); i++; }if (ioc->facts.IOCCapabilities &MPI2_IOCFACTS_CAPABILITY_TASK_SET_FULL_HANDLING ) { -printk ("%sTask Set Full" , i ?"," :"" ); +printk (KERN_CONT "%sTask Set Full" , i ?"," :"" ); i++; } iounit_pg1_flags =le32_to_cpu (ioc->iounit_pg1.Flags);if (!(iounit_pg1_flags &MPI2_IOUNITPAGE1_NATIVE_COMMAND_Q_DISABLE )) { -printk ("%sNCQ" , i ?"," :"" ); +printk (KERN_CONT "%sNCQ" , i ?"," :"" ); i++; } -printk (")\n" ); +printk (KERN_CONT ")\n" ); }/**
--- arch/x86/kernel/apic/io_apic.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/kernel/apic/io_apic.c +4 -4
@@ -1719,7 +1719,7 @@ __apicdebuginit(void) print_IO_APIC(int i, ir_entry->index ); - printk("%1d %1d %1d %1d %1d " + printk(KERN_CONT "%1d %1d %1d %1d %1d " "%1d %1d %X %02X\n", ir_entry->format, ir_entry->mask,
@@ -1739,7 +1739,7 @@ __apicdebuginit(void) print_IO_APIC(int i, entry.dest ); - printk("%1d %1d %1d %1d %1d " + printk(KERN_CONT "%1d %1d %1d %1d %1d " "%1d %1d %02X\n", entry.mask, entry.trigger,
@@ -1791,8 +1791,8 @@ __apicdebuginit(void) print_IO_APICs(voicontinue ;printk (KERN_DEBUG "IRQ%d " , irq);for_each_irq_pin (entry, cfg->irq_2_pin) -printk ("-> %d:%d" , entry->apic, entry->pin); -printk ("\n" ); +printk (KERN_CONT "-> %d:%d" , entry->apic, entry->pin); +printk (KERN_CONT "\n" ); }printk (KERN_INFO ".................................... done.\n" );