Fix quoted string which do not have a space separating
the next word on continuation quoted strings.
for example:
"a line with a word"
"but no space"
is equivalent to:
"a line with a wordbut no space"
which becomes:
"a line with a word "
"but no space"
Signed-off-by: Joe Perches <[email protected]>
Signed-off-by: Joe Perches <[email protected]>
---
arch/mips/kernel/vpe.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 38bd33f..c06eb81 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -470,7 +470,7 @@ static int apply_r_mips_lo16(struct module *me, uint32_t *location,
*/
if (v != l->value) {
printk(KERN_DEBUG "VPE loader: "
- "apply_r_mips_lo16/hi16: "
+ "apply_r_mips_lo16/hi16: \t"
"inconsistent value information\n");
return -ENOEXEC;
}
@@ -629,7 +629,7 @@ static void simplify_symbols(Elf_Shdr * sechdrs,
break;
case SHN_MIPS_SCOMMON:
- printk(KERN_DEBUG "simplify_symbols: ignoring SHN_MIPS_SCOMMON"
+ printk(KERN_DEBUG "simplify_symbols: ignoring SHN_MIPS_SCOMMON "
"symbol <%s> st_shndx %d\n", strtab + sym[i].st_name,
sym[i].st_shndx);
// .sbss section
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
arch/ia64/kernel/kprobes.c | 10 +++++-----
arch/ia64/mm/tlb.c | 2 +-
arch/ia64/sn/kernel/io_common.c | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 5fd65d8..90518e4 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -182,8 +182,8 @@ static int __kprobes unsupported_inst(uint template, uint slot,
qp = kprobe_inst & 0x3f;
if (is_cmp_ctype_unc_inst(template, slot, major_opcode, kprobe_inst)) {
if (slot == 1 && qp) {
- printk(KERN_WARNING "Kprobes on cmp unc"
- "instruction on slot 1 at <0x%lx>"
+ printk(KERN_WARNING "Kprobes on cmp unc "
+ "instruction on slot 1 at <0x%lx> "
"is not supported\n", addr);
return -EINVAL;
@@ -221,8 +221,8 @@ static int __kprobes unsupported_inst(uint template, uint slot,
* bit 12 to be equal to 1
*/
if (slot == 1 && qp) {
- printk(KERN_WARNING "Kprobes on test bit"
- "instruction on slot at <0x%lx>"
+ printk(KERN_WARNING "Kprobes on test bit "
+ "instruction on slot at <0x%lx> "
"is not supported\n", addr);
return -EINVAL;
}
@@ -242,7 +242,7 @@ static int __kprobes unsupported_inst(uint template, uint slot,
*/
int x6=(kprobe_inst >> 27) & 0x3F;
if ((x6 == 0x10) || (x6 == 0x11)) {
- printk(KERN_WARNING "Kprobes on"
+ printk(KERN_WARNING "Kprobes on "
"Indirect Predict is not supported\n");
return -EINVAL;
}
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c
index 1682fc6..cef1647 100644
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -180,7 +180,7 @@ ia64_tlb_init (void)
long status;
if ((status = ia64_pal_vm_page_size(&tr_pgbits, &purge.mask)) != 0) {
- printk(KERN_ERR "PAL_VM_PAGE_SIZE failed with status=%ld;"
+ printk(KERN_ERR "PAL_VM_PAGE_SIZE failed with status=%ld; "
"defaulting to architected purge page-sizes.\n", status);
purge.mask = 0x115557000UL;
}
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c
index 4594770..710bf51 100644
--- a/arch/ia64/sn/kernel/io_common.c
+++ b/arch/ia64/sn/kernel/io_common.c
@@ -347,7 +347,7 @@ sn_common_bus_fixup(struct pci_bus *bus,
if (controller->node >= num_online_nodes()) {
struct pcibus_bussoft *b = SN_PCIBUS_BUSSOFT(bus);
- printk(KERN_WARNING "Device ASIC=%u XID=%u PBUSNUM=%u"
+ printk(KERN_WARNING "Device ASIC=%u XID=%u PBUSNUM=%u "
"L_IO=%lx L_MEM=%lx BASE=%lx\n",
b->bs_asic_type, b->bs_xid, b->bs_persist_busnum,
b->bs_legacy_io, b->bs_legacy_mem, b->bs_base);
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
arch/s390/crypto/aes_s390.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index 5126696..e2f6216 100644
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@ -341,7 +341,7 @@ static int __init aes_init(void)
ecb_aes_alg.cra_u.blkcipher.max_keysize = AES_MIN_KEY_SIZE;
cbc_aes_alg.cra_u.blkcipher.max_keysize = AES_MIN_KEY_SIZE;
printk(KERN_INFO
- "aes_s390: hardware acceleration only available for"
+ "aes_s390: hardware acceleration only available for "
"128 bit keys\n");
}
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
arch/ppc/platforms/ev64260.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/ppc/platforms/ev64260.c b/arch/ppc/platforms/ev64260.c
index 976270d..c1f77e1 100644
--- a/arch/ppc/platforms/ev64260.c
+++ b/arch/ppc/platforms/ev64260.c
@@ -336,7 +336,7 @@ ev64260_early_serial_map(void)
#endif
if (early_serial_setup(&port) != 0)
- printk(KERN_WARNING "Early serial init of port 0"
+ printk(KERN_WARNING "Early serial init of port 0 "
"failed\n");
first_time = 0;
@@ -388,7 +388,7 @@ ev64260_setup_arch(void)
ev64260_early_serial_map();
#endif
- printk(KERN_INFO "%s %s port (C) 2001 MontaVista Software, Inc."
+ printk(KERN_INFO "%s %s port (C) 2001 MontaVista Software, Inc. "
"([email protected])\n", BOARD_VENDOR, BOARD_MACHINE);
if (ppc_md.progress)
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
arch/sparc/kernel/pcic.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index f2d432e..396718b 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -329,7 +329,7 @@ int __init pcic_probe(void)
pcic->pcic_res_cfg_addr.name = "pcic_cfg_addr";
if ((pcic->pcic_config_space_addr =
ioremap(regs[2].phys_addr, regs[2].reg_size * 2)) == 0) {
- prom_printf("PCIC: Error, cannot map"
+ prom_printf("PCIC: Error, cannot map "
"PCI Configuration Space Address.\n");
prom_halt();
}
@@ -341,7 +341,7 @@ int __init pcic_probe(void)
pcic->pcic_res_cfg_data.name = "pcic_cfg_data";
if ((pcic->pcic_config_space_data =
ioremap(regs[3].phys_addr, regs[3].reg_size * 2)) == 0) {
- prom_printf("PCIC: Error, cannot map"
+ prom_printf("PCIC: Error, cannot map "
"PCI Configuration Space Data.\n");
prom_halt();
}
@@ -518,8 +518,8 @@ static void pcic_map_pci_device(struct linux_pcic *pcic,
* board in a PCI slot. We must remap it
* under 64K but it is not done yet. XXX
*/
- printk("PCIC: Skipping I/O space at 0x%lx,"
- "this will Oops if a driver attaches;"
+ printk("PCIC: Skipping I/O space at 0x%lx, "
+ "this will Oops if a driver attaches "
"device '%s' at %02x:%02x)\n", address,
namebuf, dev->bus->number, dev->devfn);
}
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
arch/sparc64/kernel/smp.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 7cd8d94..894b506 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -236,8 +236,9 @@ void smp_synchronize_tick_client(void)
t[i].rt, t[i].master, t[i].diff, t[i].lat);
#endif
- printk(KERN_INFO "CPU %d: synchronized TICK with master CPU (last diff %ld cycles,"
- "maxerr %lu cycles)\n", smp_processor_id(), delta, rt);
+ printk(KERN_INFO "CPU %d: synchronized TICK with master CPU "
+ "(last diff %ld cycles, maxerr %lu cycles)\n",
+ smp_processor_id(), delta, rt);
}
static void smp_start_sync_tick_client(int cpu);
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
arch/powerpc/kernel/isa-bridge.c | 4 ++--
arch/powerpc/mm/fault.c | 2 +-
arch/powerpc/platforms/8xx/m8xx_setup.c | 2 +-
arch/powerpc/platforms/celleb/io-workarounds.c | 2 +-
arch/powerpc/platforms/celleb/scc_epci.c | 2 +-
arch/powerpc/sysdev/fsl_pci.c | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/kernel/isa-bridge.c b/arch/powerpc/kernel/isa-bridge.c
index f0f49d1..965bfcc 100644
--- a/arch/powerpc/kernel/isa-bridge.c
+++ b/arch/powerpc/kernel/isa-bridge.c
@@ -108,7 +108,7 @@ static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node,
if (size > 0x10000)
size = 0x10000;
- printk(KERN_ERR "no ISA IO ranges or unexpected isa range,"
+ printk(KERN_ERR "no ISA IO ranges or unexpected isa range, "
"mapping 64k\n");
__ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE,
@@ -116,7 +116,7 @@ static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node,
return;
inval_range:
- printk(KERN_ERR "no ISA IO ranges or unexpected isa range,"
+ printk(KERN_ERR "no ISA IO ranges or unexpected isa range, "
"mapping 64k\n");
__ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE,
0x10000, _PAGE_NO_CACHE|_PAGE_GUARDED);
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 8135da0..10dda22 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -189,7 +189,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
return SIGSEGV;
/* in_atomic() in user mode is really bad,
as is current->mm == NULL. */
- printk(KERN_EMERG "Page fault in user mode with"
+ printk(KERN_EMERG "Page fault in user mode with "
"in_atomic() = %d mm = %p\n", in_atomic(), mm);
printk(KERN_EMERG "NIP = %lx MSR = %lx\n",
regs->nip, regs->msr);
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index d35eda8..ba645c2 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -120,7 +120,7 @@ void __init mpc8xx_calibrate_decr(void)
ppc_tb_freq /= 16;
ppc_proc_freq = 50000000;
if (!get_freq("clock-frequency", &ppc_proc_freq))
- printk(KERN_ERR "WARNING: Estimating processor frequency"
+ printk(KERN_ERR "WARNING: Estimating processor frequency "
"(not found)\n");
printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);
diff --git a/arch/powerpc/platforms/celleb/io-workarounds.c b/arch/powerpc/platforms/celleb/io-workarounds.c
index 2b91214..32b9cec 100644
--- a/arch/powerpc/platforms/celleb/io-workarounds.c
+++ b/arch/powerpc/platforms/celleb/io-workarounds.c
@@ -256,7 +256,7 @@ int __init celleb_pci_workaround_init(void)
celleb_dummy_page_va = kmalloc(PAGE_SIZE, GFP_KERNEL);
if (!celleb_dummy_page_va) {
- printk(KERN_ERR "Celleb: dummy read disabled."
+ printk(KERN_ERR "Celleb: dummy read disabled. "
"Alloc celleb_dummy_page_va failed\n");
return 1;
}
diff --git a/arch/powerpc/platforms/celleb/scc_epci.c b/arch/powerpc/platforms/celleb/scc_epci.c
index 9d07642..a3c7cfb 100644
--- a/arch/powerpc/platforms/celleb/scc_epci.c
+++ b/arch/powerpc/platforms/celleb/scc_epci.c
@@ -95,7 +95,7 @@ void __init epci_workaround_init(struct pci_controller *hose)
private->dummy_page_da = dma_map_single(hose->parent,
celleb_dummy_page_va, PAGE_SIZE, DMA_FROM_DEVICE);
if (private->dummy_page_da == DMA_ERROR_CODE) {
- printk(KERN_ERR "EPCI: dummy read disabled."
+ printk(KERN_ERR "EPCI: dummy read disabled. "
"Map dummy page failed.\n");
return;
}
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 33df4c3..87e58e0 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -222,7 +222,7 @@ int __init fsl_add_bridge(struct device_node *dev, int is_primary)
hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK;
}
- printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx."
+ printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx. "
"Firmware bus number: %d->%d\n",
(unsigned long long)rsrc.start, hose->first_busno,
hose->last_busno);
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
arch/um/drivers/vde_user.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/um/drivers/vde_user.c b/arch/um/drivers/vde_user.c
index d9941fe..56533db 100644
--- a/arch/um/drivers/vde_user.c
+++ b/arch/um/drivers/vde_user.c
@@ -80,7 +80,7 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
vpri->args = kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
if (vpri->args == NULL) {
- printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args"
+ printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args "
"allocation failed");
return;
}
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k7.c b/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
index b5a9863..b73dce0 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
@@ -460,7 +460,7 @@ static int powernow_decode_bios (int maxfid, int startvid)
latency = psb->settlingtime;
if (latency < 100) {
- printk (KERN_INFO PFX "BIOS set settling time to %d microseconds."
+ printk (KERN_INFO PFX "BIOS set settling time to %d microseconds. "
"Should be at least 100. Correcting.\n", latency);
latency = 100;
}
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/cdrom/viocd.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index d8bb44b..1ca73d1 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -129,7 +129,7 @@ static int proc_viocd_show(struct seq_file *m, void *v)
int i;
for (i = 0; i < viocd_numdev; i++) {
- seq_printf(m, "viocd device %d is iSeries resource %10.10s"
+ seq_printf(m, "viocd device %d is iSeries resource %10.10s "
"type %4.4s, model %3.3s\n",
i, viocd_diskinfo[i].rsrcname,
viocd_diskinfo[i].type,
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/block/DAC960.c | 2 +-
drivers/block/cpqarray.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 9030c37..72c5e96 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -2999,7 +2999,7 @@ DAC960_DetectController(struct pci_dev *PCI_Device,
}
if (!DAC960_V1_EnableMemoryMailboxInterface(Controller))
{
- DAC960_Error("Unable to allocate DMA mapped memory"
+ DAC960_Error("Unable to allocate DMA mapped memory "
"for Controller at\n", Controller);
goto Failure;
}
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index c8132d9..a8acd10 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -367,7 +367,7 @@ static void __devexit cpqarray_remove_one_pci (struct pci_dev *pdev)
tmp_ptr = pci_get_drvdata(pdev);
i = tmp_ptr->ctlr;
if (hba[i] == NULL) {
- printk(KERN_ERR "cpqarray: controller %d appears to have"
+ printk(KERN_ERR "cpqarray: controller %d appears to have "
"already been removed \n", i);
return;
}
@@ -382,7 +382,7 @@ static void __devexit cpqarray_remove_one_pci (struct pci_dev *pdev)
static void __devexit cpqarray_remove_one_eisa (int i)
{
if (hba[i] == NULL) {
- printk(KERN_ERR "cpqarray: controller %d appears to have"
+ printk(KERN_ERR "cpqarray: controller %d appears to have "
"already been removed \n", i);
return;
}
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/acpi/ec.c | 4 ++--
drivers/acpi/processor_core.c | 2 +-
drivers/acpi/tables/tbutils.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 06b78e5..cb09e5e 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -175,12 +175,12 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
if (acpi_ec_check_status(ec, event)) {
if (event == ACPI_EC_EVENT_OBF_1) {
/* miss OBF = 1 GPE, don't expect it anymore */
- printk(KERN_INFO PREFIX "missing OBF_1 confirmation,"
+ printk(KERN_INFO PREFIX "missing OBF_1 confirmation, "
"switching to degraded mode.\n");
set_bit(EC_FLAGS_ONLY_IBF_GPE, &ec->flags);
} else {
/* missing GPEs, switch back to poll mode */
- printk(KERN_INFO PREFIX "missing IBF_1 confirmations,"
+ printk(KERN_INFO PREFIX "missing IBF_1 confirmations, "
"switch off interrupt mode.\n");
clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
}
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 235a51e..44156e7 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -647,7 +647,7 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
*/
if (processor_device_array[pr->id] != NULL &&
processor_device_array[pr->id] != device) {
- printk(KERN_WARNING "BIOS reported wrong ACPI id"
+ printk(KERN_WARNING "BIOS reported wrong ACPI id "
"for the processor\n");
return -ENODEV;
}
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index 5f1d85f..010f196 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.c
@@ -449,7 +449,7 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
/* XSDT has NULL entry, RSDT is used */
address = rsdt_address;
table_entry_size = sizeof(u32);
- ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry,"
+ ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry, "
"using RSDT"));
}
}
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/char/agp/generic.c | 4 ++--
drivers/char/agp/intel-agp.c | 2 +-
drivers/char/ipmi/ipmi_watchdog.c | 2 +-
drivers/char/snsc.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 64b2f6d..9d73933 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -485,12 +485,12 @@ static void agp_v2_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_
switch (*bridge_agpstat & 7) {
case 4:
*bridge_agpstat |= (AGPSTAT2_2X | AGPSTAT2_1X);
- printk(KERN_INFO PFX "BIOS bug. AGP bridge claims to only support x4 rate"
+ printk(KERN_INFO PFX "BIOS bug. AGP bridge claims to only support x4 rate. "
"Fixing up support for x2 & x1\n");
break;
case 2:
*bridge_agpstat |= AGPSTAT2_1X;
- printk(KERN_INFO PFX "BIOS bug. AGP bridge claims to only support x2 rate"
+ printk(KERN_INFO PFX "BIOS bug. AGP bridge claims to only support x2 rate. "
"Fixing up support for x1\n");
break;
default:
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index d879619..fb621cc 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -1922,7 +1922,7 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
if (intel_agp_chipsets[i].name == NULL) {
if (cap_ptr)
- printk(KERN_WARNING PFX "Unsupported Intel chipset"
+ printk(KERN_WARNING PFX "Unsupported Intel chipset "
"(device id: %04x)\n", pdev->device);
agp_put_bridge(bridge);
return -ENODEV;
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index e686fc9..ee62617 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -293,7 +293,7 @@ MODULE_PARM_DESC(preop, "Pretimeout driver operation. One of: "
"preop_none, preop_panic, preop_give_data.");
module_param(start_now, int, 0444);
-MODULE_PARM_DESC(start_now, "Set to 1 to start the watchdog as"
+MODULE_PARM_DESC(start_now, "Set to 1 to start the watchdog as "
"soon as the driver is loaded.");
module_param(nowayout, int, 0644);
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index b9c1dba..a9681d0 100644
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
@@ -402,7 +402,7 @@ scdrv_init(void)
scd = kzalloc(sizeof (struct sysctl_data_s),
GFP_KERNEL);
if (!scd) {
- printk("%s: failed to allocate device info"
+ printk("%s: failed to allocate device info "
"for %s/%s\n", __FUNCTION__,
SYSCTL_BASENAME, devname);
continue;
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/cpufreq/cpufreq.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 5e626b1..5d5f52f 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -287,7 +287,7 @@ static void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci)
if (!l_p_j_ref_freq) {
l_p_j_ref = loops_per_jiffy;
l_p_j_ref_freq = ci->old;
- dprintk("saving %lu as reference value for loops_per_jiffy;"
+ dprintk("saving %lu as reference value for loops_per_jiffy; "
"freq is %u kHz\n", l_p_j_ref, l_p_j_ref_freq);
}
if ((val == CPUFREQ_PRECHANGE && ci->old < ci->new) ||
@@ -295,7 +295,7 @@ static void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci)
(val == CPUFREQ_RESUMECHANGE || val == CPUFREQ_SUSPENDCHANGE)) {
loops_per_jiffy = cpufreq_scale(l_p_j_ref, l_p_j_ref_freq,
ci->new);
- dprintk("scaling loops_per_jiffy to %lu"
+ dprintk("scaling loops_per_jiffy to %lu "
"for frequency %u kHz\n", loops_per_jiffy, ci->new);
}
}
@@ -1311,7 +1311,7 @@ static int cpufreq_resume(struct sys_device * sysdev)
struct cpufreq_freqs freqs;
if (!(cpufreq_driver->flags & CPUFREQ_PM_NO_WARN))
- dprintk("Warning: CPU frequency"
+ dprintk("Warning: CPU frequency "
"is %u, cpufreq assumed %u kHz.\n",
cur_freq, cpu_policy->cur);
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/hwmon/vt8231.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index 2196a84..f876617 100644
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -504,7 +504,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
case 4: data->fan_div[nr] = 2; break;
case 8: data->fan_div[nr] = 3; break;
default:
- dev_err(dev, "fan_div value %ld not supported."
+ dev_err(dev, "fan_div value %ld not supported. "
"Choose one of 1, 2, 4 or 8!\n", val);
mutex_unlock(&data->update_lock);
return -EINVAL;
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/i2c/busses/i2c-davinci.c | 4 ++--
drivers/i2c/busses/i2c-omap.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index bd7aaff..6767988 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -404,7 +404,7 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id)
DAVINCI_I2C_STR_REG,
w);
} else
- dev_err(dev->dev, "RDR IRQ while no"
+ dev_err(dev->dev, "RDR IRQ while no "
"data requested\n");
break;
@@ -423,7 +423,7 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id)
DAVINCI_I2C_IMR_REG,
w);
} else
- dev_err(dev->dev, "TDR IRQ while no data to"
+ dev_err(dev->dev, "TDR IRQ while no data to "
"send\n");
break;
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 89a3002..cb55cf2 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -203,7 +203,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
while (!(omap_i2c_read_reg(dev, OMAP_I2C_SYSS_REG) &
OMAP_I2C_SYSS_RDONE)) {
if (time_after(jiffies, timeout)) {
- dev_warn(dev->dev, "timeout waiting"
+ dev_warn(dev->dev, "timeout waiting "
"for controller reset\n");
return -ETIMEDOUT;
}
@@ -483,7 +483,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
dev->buf_len--;
}
} else
- dev_err(dev->dev, "RRDY IRQ while no data"
+ dev_err(dev->dev, "RRDY IRQ while no data "
"requested\n");
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RRDY);
continue;
@@ -498,7 +498,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
dev->buf_len--;
}
} else
- dev_err(dev->dev, "XRDY IRQ while no"
+ dev_err(dev->dev, "XRDY IRQ while no "
"data to send\n");
omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w);
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY);
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/ide/ppc/pmac.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 5afdfef..7f7a598 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1513,7 +1513,7 @@ pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq)
if (pmif->broken_dma && cur_addr & (L1_CACHE_BYTES - 1)) {
if (pmif->broken_dma_warn == 0) {
- printk(KERN_WARNING "%s: DMA on non aligned address,"
+ printk(KERN_WARNING "%s: DMA on non aligned address, "
"switching to PIO on Ohare chipset\n", drive->name);
pmif->broken_dma_warn = 1;
}
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/ieee1394/raw1394.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index cadf047..37e7e10 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -858,7 +858,7 @@ static int arm_read(struct hpsb_host *host, int nodeid, quadlet_t * buffer,
int found = 0, size = 0, rcode = -1;
struct arm_request_response *arm_req_resp = NULL;
- DBGMSG("arm_read called by node: %X"
+ DBGMSG("arm_read called by node: %X "
"addr: %4.4x %8.8x length: %Zu", nodeid,
(u16) ((addr >> 32) & 0xFFFF), (u32) (addr & 0xFFFFFFFF),
length);
@@ -1012,7 +1012,7 @@ static int arm_write(struct hpsb_host *host, int nodeid, int destid,
int found = 0, size = 0, rcode = -1, length_conflict = 0;
struct arm_request_response *arm_req_resp = NULL;
- DBGMSG("arm_write called by node: %X"
+ DBGMSG("arm_write called by node: %X "
"addr: %4.4x %8.8x length: %Zu", nodeid,
(u16) ((addr >> 32) & 0xFFFF), (u32) (addr & 0xFFFFFFFF),
length);
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/input/keyboard/omap-keypad.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index babc913..ce6206f 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -335,7 +335,7 @@ static int __init omap_kp_probe(struct platform_device *pdev)
/* Cols: outputs */
for (col_idx = 0; col_idx < omap_kp->cols; col_idx++) {
if (omap_request_gpio(col_gpios[col_idx]) < 0) {
- printk(KERN_ERR "Failed to request"
+ printk(KERN_ERR "Failed to request "
"GPIO%d for keypad\n",
col_gpios[col_idx]);
goto err1;
@@ -345,7 +345,7 @@ static int __init omap_kp_probe(struct platform_device *pdev)
/* Rows: inputs */
for (row_idx = 0; row_idx < omap_kp->rows; row_idx++) {
if (omap_request_gpio(row_gpios[row_idx]) < 0) {
- printk(KERN_ERR "Failed to request"
+ printk(KERN_ERR "Failed to request "
"GPIO%d for keypad\n",
row_gpios[row_idx]);
goto err2;
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/infiniband/hw/ehca/ehca_cq.c | 2 +-
drivers/infiniband/hw/ehca/ehca_qp.c | 6 +++---
drivers/infiniband/ulp/iser/iser_initiator.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c
index 79c25f5..0467c15 100644
--- a/drivers/infiniband/hw/ehca/ehca_cq.c
+++ b/drivers/infiniband/hw/ehca/ehca_cq.c
@@ -246,7 +246,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
} else {
if (h_ret != H_PAGE_REGISTERED) {
ehca_err(device, "Registration of page failed "
- "ehca_cq=%p cq_num=%x h_ret=%li"
+ "ehca_cq=%p cq_num=%x h_ret=%li "
"counter=%i act_pages=%i",
my_cq, my_cq->cq_number,
h_ret, counter, param.act_pages);
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index 2e3e654..091985b 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -858,7 +858,7 @@ struct ib_srq *ehca_create_srq(struct ib_pd *pd,
update_mask,
mqpcb, my_qp->galpas.kernel);
if (hret != H_SUCCESS) {
- ehca_err(pd->device, "Could not modify SRQ to INIT"
+ ehca_err(pd->device, "Could not modify SRQ to INIT "
"ehca_qp=%p qp_num=%x h_ret=%li",
my_qp, my_qp->real_qp_num, hret);
goto create_srq2;
@@ -872,7 +872,7 @@ struct ib_srq *ehca_create_srq(struct ib_pd *pd,
update_mask,
mqpcb, my_qp->galpas.kernel);
if (hret != H_SUCCESS) {
- ehca_err(pd->device, "Could not enable SRQ"
+ ehca_err(pd->device, "Could not enable SRQ "
"ehca_qp=%p qp_num=%x h_ret=%li",
my_qp, my_qp->real_qp_num, hret);
goto create_srq2;
@@ -886,7 +886,7 @@ struct ib_srq *ehca_create_srq(struct ib_pd *pd,
update_mask,
mqpcb, my_qp->galpas.kernel);
if (hret != H_SUCCESS) {
- ehca_err(pd->device, "Could not modify SRQ to RTR"
+ ehca_err(pd->device, "Could not modify SRQ to RTR "
"ehca_qp=%p qp_num=%x h_ret=%li",
my_qp, my_qp->real_qp_num, hret);
goto create_srq2;
diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c
index a6f2303..ba1b455 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -561,7 +561,7 @@ void iser_rcv_completion(struct iser_desc *rx_desc,
if (opcode == ISCSI_OP_SCSI_CMD_RSP) {
itt = get_itt(hdr->itt); /* mask out cid and age bits */
if (!(itt < session->cmds_max))
- iser_err("itt can't be matched to task!!!"
+ iser_err("itt can't be matched to task!!! "
"conn %p opcode %d cmds_max %d itt %d\n",
conn->iscsi_conn,opcode,session->cmds_max,itt);
/* use the mapping given with the cmds array indexed by itt */
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/macintosh/smu.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index d409f67..0568313 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -194,7 +194,7 @@ static irqreturn_t smu_db_intr(int irq, void *arg)
reply_len = rc == 0 ? smu->cmd_buf->length : 0;
DPRINTK("SMU: reply len: %d\n", reply_len);
if (reply_len > cmd->reply_len) {
- printk(KERN_WARNING "SMU: reply buffer too small,"
+ printk(KERN_WARNING "SMU: reply buffer too small, "
"got %d bytes for a %d bytes buffer\n",
reply_len, cmd->reply_len);
reply_len = cmd->reply_len;
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/isdn/i4l/isdn_ppp.c | 2 +-
drivers/isdn/i4l/isdn_x25iface.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 9f5fe37..742e0f6 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -2472,7 +2472,7 @@ static void isdn_ppp_ccp_reset_ack_rcvd(struct ippp_struct *is,
" for id %d but not expected\n", id);
} else {
printk(KERN_INFO "ippp_ccp: ResetAck received out of"
- "sync for id %d\n", id);
+ " sync for id %d\n", id);
}
if(rs->ta) {
rs->ta = 0;
diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
index 8b3efc2..a2121c1 100644
--- a/drivers/isdn/i4l/isdn_x25iface.c
+++ b/drivers/isdn/i4l/isdn_x25iface.c
@@ -65,7 +65,7 @@ static struct concap_proto_ops ix25_pops = {
/* error message helper function */
static void illegal_state_warn( unsigned state, unsigned char firstbyte)
{
- printk( KERN_WARNING "isdn_x25iface: firstbyte %x illegal in"
+ printk( KERN_WARNING "isdn_x25iface: firstbyte %x illegal in "
"current state %d\n",firstbyte, state );
}
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/media/dvb/frontends/ves1820.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c
index 60433b5..8791701 100644
--- a/drivers/media/dvb/frontends/ves1820.c
+++ b/drivers/media/dvb/frontends/ves1820.c
@@ -65,7 +65,7 @@ static int ves1820_writereg(struct ves1820_state *state, u8 reg, u8 data)
ret = i2c_transfer(state->i2c, &msg, 1);
if (ret != 1)
- printk("ves1820: %s(): writereg error (reg == 0x%02x,"
+ printk("ves1820: %s(): writereg error (reg == 0x%02x, "
"val == 0x%02x, ret == %i)\n", __FUNCTION__, reg, data, ret);
return (ret != 1) ? -EREMOTEIO : 0;
@@ -84,7 +84,7 @@ static u8 ves1820_readreg(struct ves1820_state *state, u8 reg)
ret = i2c_transfer(state->i2c, msg, 2);
if (ret != 2)
- printk("ves1820: %s(): readreg error (reg == 0x%02x,"
+ printk("ves1820: %s(): readreg error (reg == 0x%02x, "
"ret == %i)\n", __FUNCTION__, reg, ret);
return b1[0];
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/media/radio/radio-gemtek.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 5e4b9dd..9dafc35 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -58,10 +58,10 @@ static int initmute = 1;
static int radio_nr = -1;
module_param(io, int, 0444);
-MODULE_PARM_DESC(io, "Force I/O port for the GemTek Radio card if automatic"
+MODULE_PARM_DESC(io, "Force I/O port for the GemTek Radio card if automatic "
"probing is disabled or fails. The most common I/O ports are: 0x20c "
"0x30c, 0x24c or 0x34c (0x20c, 0x248 and 0x28c have been reported to "
- " work for the combined sound/radiocard).");
+ "work for the combined sound/radiocard).");
module_param(probe, bool, 0444);
MODULE_PARM_DESC(probe, "Enable automatic device probing. Note: only the most "
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/misc/ioc4.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c
index 05172d2..e5e7755 100644
--- a/drivers/misc/ioc4.c
+++ b/drivers/misc/ioc4.c
@@ -200,7 +200,7 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)
if (period > IOC4_CALIBRATE_LOW_LIMIT ||
period < IOC4_CALIBRATE_HIGH_LIMIT) {
printk(KERN_INFO
- "IOC4 %s: Clock calibration failed. Assuming"
+ "IOC4 %s: Clock calibration failed. Assuming "
"PCI clock is %d ns.\n",
pci_name(idd->idd_pdev),
IOC4_CALIBRATE_DEFAULT / IOC4_EXTINT_COUNT_DIVISOR);
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/media/video/cx25840/cx25840-vbi.c | 2 +-
drivers/media/video/meye.c | 2 +-
drivers/media/video/saa7134/saa7134-input.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/video/cx25840/cx25840-vbi.c b/drivers/media/video/cx25840/cx25840-vbi.c
index ced13fe..d2949e5 100644
--- a/drivers/media/video/cx25840/cx25840-vbi.c
+++ b/drivers/media/video/cx25840/cx25840-vbi.c
@@ -180,7 +180,7 @@ void cx25840_vbi_setup(struct i2c_client *client)
fsc/1000000,fsc%1000000);
v4l_dbg(1, cx25840_debug, client, "hblank %i, hactive %i, "
- "vblank %i , vactive %i, vblank656 %i, src_dec %i,"
+ "vblank %i , vactive %i, vblank656 %i, src_dec %i, "
"burst 0x%02x, luma_lpf %i, uv_lpf %i, comb 0x%02x,"
" sc 0x%06x\n",
hblank, hactive, vblank, vactive, vblank656,
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index c311632..3d51fa0 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -2023,7 +2023,7 @@ static int __init meye_init(void)
if (gbufsize < 0 || gbufsize > MEYE_MAX_BUFSIZE)
gbufsize = MEYE_MAX_BUFSIZE;
gbufsize = PAGE_ALIGN(gbufsize);
- printk(KERN_INFO "meye: using %d buffers with %dk (%dk total)"
+ printk(KERN_INFO "meye: using %d buffers with %dk (%dk total) "
"for capture\n",
gbuffers,
gbufsize / 1024, gbuffers * gbufsize / 1024);
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 3abaa1b..a485185 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -49,7 +49,7 @@ module_param(repeat_delay, int, 0644);
MODULE_PARM_DESC(repeat_delay, "delay before key repeat started");
static int repeat_period = 33;
module_param(repeat_period, int, 0644);
-MODULE_PARM_DESC(repeat_period, "repeat period between"
+MODULE_PARM_DESC(repeat_period, "repeat period between "
"keypresses when key is down");
#define dprintk(fmt, arg...) if (ir_debug) \
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/message/i2o/exec-osm.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c
index 6cbcc21..16177c2 100644
--- a/drivers/message/i2o/exec-osm.c
+++ b/drivers/message/i2o/exec-osm.c
@@ -503,7 +503,7 @@ static int i2o_exec_reply(struct i2o_controller *c, u32 m,
* to aid in debugging.
*
*/
- printk(KERN_WARNING "%s: Unsolicited message reply sent to core!"
+ printk(KERN_WARNING "%s: Unsolicited message reply sent to core! "
"Message dumped to syslog\n", c->name);
i2o_dump_message(msg);
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/mtd/nand/nandsim.c | 2 +-
drivers/mtd/onenand/onenand_base.c | 4 ++--
drivers/mtd/ssfdc.c | 4 ++--
drivers/mtd/ubi/build.c | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 10490b4..54be667 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -1425,7 +1425,7 @@ static int do_state_action(struct nandsim *ns, uint32_t action)
case ACTION_HALFOFF:
if (!(ns->options & OPT_PAGE512_8BIT)) {
- NS_ERR("do_state_action: BUG! can't skip half of page for non-512"
+ NS_ERR("do_state_action: BUG! can't skip half of page for non-512 "
"byte page size 8x chips\n");
return -1;
}
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 1b0b320..89ddbaf 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -1119,7 +1119,7 @@ static int onenand_bbt_wait(struct mtd_info *mtd, int state)
if (ecc & ONENAND_ECC_2BIT_ALL)
return ONENAND_BBT_READ_ERROR;
} else {
- printk(KERN_ERR "onenand_bbt_wait: read timeout!"
+ printk(KERN_ERR "onenand_bbt_wait: read timeout! "
"ctrl=0x%04x intr=0x%04x\n", ctrl, interrupt);
return ONENAND_BBT_READ_FATAL_ERROR;
}
@@ -2542,7 +2542,7 @@ static void onenand_resume(struct mtd_info *mtd)
if (this->state == FL_PM_SUSPENDED)
onenand_release_device(mtd);
else
- printk(KERN_ERR "resume() called for the chip which is not"
+ printk(KERN_ERR "resume() called for the chip which is not "
"in suspended state\n");
}
diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c
index a5f3d60..9a38328 100644
--- a/drivers/mtd/ssfdc.c
+++ b/drivers/mtd/ssfdc.c
@@ -222,7 +222,7 @@ static int get_logical_address(uint8_t *oob_buf)
if (get_parity(block_address, 10) != parity) {
DEBUG(MTD_DEBUG_LEVEL0,
- "SSFDC_RO: logical address field%d"
+ "SSFDC_RO: logical address field%d "
"parity error(0x%04X)\n", j+1,
block_address);
} else {
@@ -280,7 +280,7 @@ static int build_logical_block_map(struct ssfdcr_record *ssfdc)
(unsigned short)phys_block;
DEBUG(MTD_DEBUG_LEVEL2,
- "SSFDC_RO: build_block_map() phys_block=%d,"
+ "SSFDC_RO: build_block_map() phys_block=%d, "
"logic_block_addr=%d, zone=%d\n",
phys_block, block_address, zone_index);
}
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 0236539..c3b37e7 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -852,10 +852,10 @@ MODULE_PARM_DESC(mtd, "MTD devices to attach. Parameter format: "
"Optional \"vid_hdr_offs\" and \"data_offs\" parameters "
"specify UBI VID header position and data starting "
"position to be used by UBI.\n"
- "Example: mtd=content,1984,2048 mtd=4 - attach MTD device"
- "with name content using VID header offset 1984 and data "
- "start 2048, and MTD device number 4 using default "
- "offsets");
+ "Example: mtd=content,1984,2048 mtd=4 - attach MTD "
+ "device with name content using VID header offset 1984 "
+ "and data start 2048, and MTD device number 4 using "
+ "default offsets");
MODULE_VERSION(__stringify(UBI_VERSION));
MODULE_DESCRIPTION("UBI - Unsorted Block Images");
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/chelsio/cxgb2.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 2dbf8dc..3eca4e3 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -1006,7 +1006,7 @@ static int __devinit init_one(struct pci_dev *pdev,
pci_using_dac = 1;
if (pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) {
- CH_ERR("%s: unable to obtain 64-bit DMA for"
+ CH_ERR("%s: unable to obtain 64-bit DMA for "
"consistent allocations\n", pci_name(pdev));
err = -ENODEV;
goto out_disable_pdev;
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/cxgb3/cxgb3_offload.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index bd25421..7086f76 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -1004,7 +1004,7 @@ void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)
if (!is_offloading(olddev))
return;
if (!is_offloading(newdev)) {
- printk(KERN_WARNING "%s: Redirect to non-offload"
+ printk(KERN_WARNING "%s: Redirect to non-offload "
"device ignored.\n", __FUNCTION__);
return;
}
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/ixgbe/ixgbe_common.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index 512e3b2..b7e50bc 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -950,7 +950,7 @@ s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)
u32 rmcs_reg;
if (packetbuf_num < 0 || packetbuf_num > 7)
- hw_dbg(hw, "Invalid packet buffer number [%d], expected range"
+ hw_dbg(hw, "Invalid packet buffer number [%d], expected range "
"is 0-7\n", packetbuf_num);
frctl_reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/netxen/netxen_nic_hw.c | 2 +-
drivers/net/netxen/netxen_nic_init.c | 4 ++--
drivers/net/netxen/netxen_nic_main.c | 6 +++---
drivers/net/netxen/netxen_nic_niu.c | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 2c19b8d..8d692e2 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -664,7 +664,7 @@ void netxen_nic_pci_change_crbwindow(struct netxen_adapter *adapter, u32 wndw)
NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW_F3));
break;
default:
- printk(KERN_INFO "Changing the window for PCI function"
+ printk(KERN_INFO "Changing the window for PCI function "
"%d\n", adapter->ahw.pci_func);
offset = PCI_OFFSET_SECOND_RANGE(adapter,
NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW));
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 3758926..89d9b53 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -1102,8 +1102,8 @@ netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
}
if (buffer->lro_current_frags != buffer->lro_expected_frags) {
if (buffer->lro_expected_frags != 0) {
- printk("LRO: (refhandle:%x) recv frag."
- "wait for last. flags: %x expected:%d"
+ printk("LRO: (refhandle:%x) recv frag. "
+ "wait for last. flags: %x expected:%d "
"have:%d\n", index,
netxen_get_sts_desc_lro_last_frag(desc),
buffer->lro_expected_frags,
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index a80f0cd..f648d43 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -287,7 +287,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
printk(KERN_INFO "%s \n", netxen_nic_driver_string);
if (pdev->class != 0x020000) {
- printk(KERN_ERR"NetXen function %d, class %x will not"
+ printk(KERN_ERR"NetXen function %d, class %x will not "
"be enabled.\n",pci_func_id, pdev->class);
return -ENODEV;
}
@@ -511,7 +511,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
vmalloc(RCV_BUFFSIZE);
if (rcv_desc->rx_buf_arr == NULL) {
- printk(KERN_ERR "%s: Could not allocate"
+ printk(KERN_ERR "%s: Could not allocate "
"rcv_desc->rx_buf_arr memory:%d\n",
netxen_nic_driver_name,
(int)RCV_BUFFSIZE);
@@ -983,7 +983,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
}
if (frag_count > MAX_BUFFERS_PER_CMD) {
- printk("%s: %s netxen_nic_xmit_frame: frag_count (%d)"
+ printk("%s: %s netxen_nic_xmit_frame: frag_count (%d) "
"too large, can handle only %d frags\n",
netxen_nic_driver_name, netdev->name,
frag_count, MAX_BUFFERS_PER_CMD);
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c
index 5b9e1b3..155429d 100644
--- a/drivers/net/netxen/netxen_nic_niu.c
+++ b/drivers/net/netxen/netxen_nic_niu.c
@@ -544,8 +544,8 @@ int netxen_niu_gbe_handle_phy_interrupt(struct netxen_adapter *adapter,
port,
enable);
} else {
- printk(KERN_ERR PFX "ERROR reading"
- "PHY status. Illegal speed.\n");
+ printk(KERN_ERR PFX "ERROR reading "
+ "PHY status. Invalid speed.\n");
result = -1;
}
} else {
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/wireless/b43/phy.c | 2 +-
drivers/net/wireless/b43legacy/phy.c | 2 +-
drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 2 +-
drivers/net/wireless/libertas/wext.c | 2 +-
drivers/net/wireless/netwave_cs.c | 2 +-
drivers/net/wireless/p54usb.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/b43/phy.c b/drivers/net/wireless/b43/phy.c
index 3d4ed64..7ff091e 100644
--- a/drivers/net/wireless/b43/phy.c
+++ b/drivers/net/wireless/b43/phy.c
@@ -2214,7 +2214,7 @@ int b43_phy_init_tssi2dbm_table(struct b43_wldev *dev)
}
dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
if (dyn_tssi2dbm == NULL) {
- b43err(dev->wl, "Could not allocate memory"
+ b43err(dev->wl, "Could not allocate memory "
"for tssi2dbm table\n");
return -ENOMEM;
}
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c
index 22a4b3d..491e518 100644
--- a/drivers/net/wireless/b43legacy/phy.c
+++ b/drivers/net/wireless/b43legacy/phy.c
@@ -2020,7 +2020,7 @@ int b43legacy_phy_init_tssi2dbm_table(struct b43legacy_wldev *dev)
phy->idle_tssi = 62;
dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
if (dyn_tssi2dbm == NULL) {
- b43legacyerr(dev->wl, "Could not allocate memory"
+ b43legacyerr(dev->wl, "Could not allocate memory "
"for tssi2dbm table\n");
return -ENOMEM;
}
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
index b37f1e3..af3de33 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
@@ -2149,7 +2149,7 @@ int bcm43xx_phy_init_tssi2dbm_table(struct bcm43xx_private *bcm)
}
dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
if (dyn_tssi2dbm == NULL) {
- printk(KERN_ERR PFX "Could not allocate memory"
+ printk(KERN_ERR PFX "Could not allocate memory "
"for tssi2dbm table\n");
return -ENOMEM;
}
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index c6f5aa3..395b788 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -1528,7 +1528,7 @@ static int wlan_set_encodeext(struct net_device *dev,
&& (ext->key_len != KEY_LEN_WPA_TKIP))
|| ((alg == IW_ENCODE_ALG_CCMP)
&& (ext->key_len != KEY_LEN_WPA_AES))) {
- lbs_deb_wext("invalid size %d for key of alg"
+ lbs_deb_wext("invalid size %d for key of alg "
"type %d\n",
ext->key_len,
alg);
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index 2402cb8..d2fa079 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -806,7 +806,7 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
for (i = 0; i < 6; i++)
dev->dev_addr[i] = readb(ramBase + NETWAVE_EREG_PA + i);
- printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx"
+ printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx, "
"id %c%c, hw_addr %s\n",
dev->name, dev->base_addr, dev->irq,
(u_long) ramBase,
diff --git a/drivers/net/wireless/p54usb.c b/drivers/net/wireless/p54usb.c
index 755482a..60d286e 100644
--- a/drivers/net/wireless/p54usb.c
+++ b/drivers/net/wireless/p54usb.c
@@ -308,7 +308,7 @@ static int p54u_read_eeprom(struct ieee80211_hw *dev)
buf = kmalloc(0x2020, GFP_KERNEL);
if (!buf) {
- printk(KERN_ERR "prism54usb: cannot allocate memory for"
+ printk(KERN_ERR "prism54usb: cannot allocate memory for "
"eeprom readback!\n");
return -ENOMEM;
}
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/wan/wanxl.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index 8e320b7..ad8c865 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -743,7 +743,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
}while (time_after(timeout, jiffies));
if (!stat) {
- printk(KERN_WARNING "wanXL %s: timeout while initializing card"
+ printk(KERN_WARNING "wanXL %s: timeout while initializing card "
"firmware\n", pci_name(pdev));
wanxl_pci_remove_one(pdev);
return -ENODEV;
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/sk98lin/skgepnmi.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/sk98lin/skgepnmi.c b/drivers/net/sk98lin/skgepnmi.c
index b36dd9a..678659f 100644
--- a/drivers/net/sk98lin/skgepnmi.c
+++ b/drivers/net/sk98lin/skgepnmi.c
@@ -383,7 +383,7 @@ int Level) /* Initialization level */
SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR049, SK_PNMI_ERR049MSG);
SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_INIT | SK_DBGCAT_FATAL,
- ("CounterOffset struct size (%d) differs from"
+ ("CounterOffset struct size (%d) differs from "
"SK_PNMI_MAX_IDX (%d)\n",
SK_PNMI_CNT_NO, SK_PNMI_MAX_IDX));
}
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/rtc/rtc-v3020.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c
index a6b5729..0e7a15d 100644
--- a/drivers/rtc/rtc-v3020.c
+++ b/drivers/rtc/rtc-v3020.c
@@ -200,7 +200,7 @@ static int rtc_probe(struct platform_device *pdev)
* are all disabled */
v3020_set_reg(chip, V3020_STATUS_0, 0x0);
- dev_info(&pdev->dev, "Chip available at physical address 0x%llx,"
+ dev_info(&pdev->dev, "Chip available at physical address 0x%llx, "
"data connected to D%d\n",
(unsigned long long)pdev->resource[0].start,
chip->leftshift);
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/pci/hotplug/pci_hotplug_core.c | 2 +-
drivers/pci/probe.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index 01c351c..b491a36 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -627,7 +627,7 @@ int pci_hp_register (struct hotplug_slot *slot)
if ((slot->info == NULL) || (slot->ops == NULL))
return -EINVAL;
if (slot->release == NULL) {
- dbg("Why are you trying to register a hotplug slot"
+ dbg("Why are you trying to register a hotplug slot "
"without a proper release function?\n");
return -EINVAL;
}
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 463a5a9..bd6995f 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -658,13 +658,13 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass
(child->number > bus->subordinate) ||
(child->number < bus->number) ||
(child->subordinate < bus->number)) {
- pr_debug("PCI: Bus #%02x (-#%02x) is %s"
+ pr_debug("PCI: Bus #%02x (-#%02x) is %s "
"hidden behind%s bridge #%02x (-#%02x)\n",
child->number, child->subordinate,
(bus->number > child->subordinate &&
bus->subordinate < child->number) ?
- "wholly " : " partially",
- bus->self->transparent ? " transparent" : " ",
+ "wholly" : "partially",
+ bus->self->transparent ? " transparent" : "",
bus->number, bus->subordinate);
}
bus = bus->parent;
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/s390/char/monwriter.c | 2 +-
drivers/s390/char/vmlogrdr.c | 2 +-
drivers/s390/cio/chsc.c | 2 +-
drivers/s390/net/claw.c | 2 +-
drivers/s390/net/lcs.c | 2 +-
drivers/s390/scsi/zfcp_fsf.c | 10 +++++-----
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index 20442fb..a86c053 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -295,7 +295,7 @@ module_init(mon_init);
module_exit(mon_exit);
module_param_named(max_bufs, mon_max_bufs, int, 0644);
-MODULE_PARM_DESC(max_bufs, "Maximum number of sample monitor data buffers"
+MODULE_PARM_DESC(max_bufs, "Maximum number of sample monitor data buffers "
"that can be active at one time");
MODULE_AUTHOR("Melissa Howland <[email protected]>");
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index e0c4c50..d364e0b 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -683,7 +683,7 @@ static int vmlogrdr_register_driver(void)
/* Register with iucv driver */
ret = iucv_register(&vmlogrdr_iucv_handler, 1);
if (ret) {
- printk (KERN_ERR "vmlogrdr: failed to register with"
+ printk (KERN_ERR "vmlogrdr: failed to register with "
"iucv driver\n");
goto out;
}
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 597c0c7..bda3ea6 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -1075,7 +1075,7 @@ chsc_determine_css_characteristics(void)
scsc_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
if (!scsc_area) {
- CIO_MSG_EVENT(0, "Was not able to determine available"
+ CIO_MSG_EVENT(0, "Was not able to determine available "
"CHSCs due to no memory.\n");
return -ENOMEM;
}
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 3561982..f63b518 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -2416,7 +2416,7 @@ init_ccw_bk(struct net_device *dev)
privptr->p_buff_pages_perwrite);
#endif
if (p_buff==NULL) {
- printk(KERN_INFO "%s:%s __get_free_pages"
+ printk(KERN_INFO "%s:%s __get_free_pages "
"for writes buf failed : get is for %d pages\n",
dev->name,
__FUNCTION__,
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 0fd663b..7bfe8d7 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1115,7 +1115,7 @@ list_modified:
rc = lcs_send_setipm(card, ipm);
spin_lock_irqsave(&card->ipm_lock, flags);
if (rc) {
- PRINT_INFO("Adding multicast address failed."
+ PRINT_INFO("Adding multicast address failed. "
"Table possibly full!\n");
/* store ipm in failed list -> will be added
* to ipm_list again, so a retry will be done
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index ff866eb..260b1ce 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -502,7 +502,7 @@ zfcp_fsf_fsfstatus_qual_eval(struct zfcp_fsf_req *fsf_req)
fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
break;
case FSF_SQ_NO_RECOM:
- ZFCP_LOG_NORMAL("bug: No recommendation could be given for a"
+ ZFCP_LOG_NORMAL("bug: No recommendation could be given for a "
"problem on the adapter %s "
"Stopping all operations on this adapter. ",
zfcp_get_busid_by_adapter(fsf_req->adapter));
@@ -813,7 +813,7 @@ zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *fsf_req)
read_unlock_irqrestore(&zfcp_data.config_lock, flags);
if (!port || (port->d_id != (status_buffer->d_id & ZFCP_DID_MASK))) {
- ZFCP_LOG_NORMAL("bug: Reopen port indication received for"
+ ZFCP_LOG_NORMAL("bug: Reopen port indication received for "
"nonexisting port with d_id 0x%06x on "
"adapter %s. Ignored.\n",
status_buffer->d_id & ZFCP_DID_MASK,
@@ -2280,7 +2280,7 @@ zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action)
&lock_flags, &fsf_req);
if (retval) {
ZFCP_LOG_INFO("error: Out of resources. Could not create an "
- "exchange port data request for"
+ "exchange port data request for "
"the adapter %s.\n",
zfcp_get_busid_by_adapter(adapter));
write_unlock_irqrestore(&adapter->request_queue.queue_lock,
@@ -2339,7 +2339,7 @@ zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter,
0, NULL, &lock_flags, &fsf_req);
if (retval) {
ZFCP_LOG_INFO("error: Out of resources. Could not create an "
- "exchange port data request for"
+ "exchange port data request for "
"the adapter %s.\n",
zfcp_get_busid_by_adapter(adapter));
write_unlock_irqrestore(&adapter->request_queue.queue_lock,
@@ -4725,7 +4725,7 @@ zfcp_fsf_req_create(struct zfcp_adapter *adapter, u32 fsf_cmd, int req_flags,
/* allocate new FSF request */
fsf_req = zfcp_fsf_req_alloc(pool, req_flags);
if (unlikely(NULL == fsf_req)) {
- ZFCP_LOG_DEBUG("error: Could not put an FSF request into"
+ ZFCP_LOG_DEBUG("error: Could not put an FSF request into "
"the outbound (send) queue.\n");
ret = -ENOMEM;
goto failed_fsf_req;
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/scsi/aic94xx/aic94xx_sds.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/aic94xx/aic94xx_sds.c b/drivers/scsi/aic94xx/aic94xx_sds.c
index 06509bf..f45f0b9 100644
--- a/drivers/scsi/aic94xx/aic94xx_sds.c
+++ b/drivers/scsi/aic94xx/aic94xx_sds.c
@@ -325,8 +325,8 @@ asd_hwi_check_ocm_access (struct asd_ha_struct *asd_ha)
goto out;
}
- printk(KERN_INFO "OCM is not initialized by BIOS,"
- "reinitialize it and ignore it, current IntrptStatus"
+ printk(KERN_INFO "OCM is not initialized by BIOS, "
+ "reinitialize it and ignore it, current IntrptStatus "
"is 0x%x\n", v);
if (v)
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/scsi/aic7xxx/aic79xx_osm.c | 2 +-
drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 2d02040..581ac18 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -338,7 +338,7 @@ MODULE_PARM_DESC(aic79xx,
" amplitude:<int> Set the signal amplitude (0-7).\n"
" seltime:<int> Selection Timeout:\n"
" (0/256ms,1/128ms,2/64ms,3/32ms)\n"
-" slowcrc Turn on the SLOWCRC bit (Rev B only)\n"
+" slowcrc Turn on the SLOWCRC bit (Rev B only)\n"
"\n"
" Sample /etc/modprobe.conf line:\n"
" Enable verbose logging\n"
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 66f0259..8ec99e2 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -374,7 +374,7 @@ ahd_pci_map_registers(struct ahd_softc *ahd)
ahd->bshs[1].ioport = base2;
command |= PCIM_CMD_PORTEN;
} else {
- printf("aic79xx: PCI%d:%d:%d IO regions 0x%lx and 0x%lx"
+ printf("aic79xx: PCI%d:%d:%d IO regions 0x%lx and 0x%lx "
"unavailable. Cannot map device.\n",
ahd_get_pci_bus(ahd->dev_softc),
ahd_get_pci_slot(ahd->dev_softc),
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/scsi/lpfc/lpfc_attr.c | 2 +-
drivers/scsi/lpfc/lpfc_ct.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 80a1121..d9d6791 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -1182,7 +1182,7 @@ lpfc_nodev_tmo_set(struct lpfc_vport *vport, int val)
}
lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
"0403 lpfc_nodev_tmo attribute cannot be set to"
- "%d, allowed range is [%d, %d]\n",
+ " %d, allowed range is [%d, %d]\n",
val, LPFC_MIN_DEVLOSS_TMO, LPFC_MAX_DEVLOSS_TMO);
return -EINVAL;
}
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index c701e4d..88b39d5 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -473,7 +473,7 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint32_t Size)
KERN_INFO,
LOG_DISCOVERY,
"0238 Process "
- "x%x NameServer Rsp"
+ "x%x NameServer Rsp "
"Data: x%x x%x x%x\n",
Did, ndlp->nlp_flag,
vport->fc_flag,
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/scsi/qla4xxx/ql4_init.c | 2 +-
drivers/scsi/qla4xxx/ql4_os.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index d692c71..ab619a8 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -1184,7 +1184,7 @@ int qla4xxx_initialize_adapter(struct scsi_qla_host *ha,
*/
status = qla4xxx_initialize_ddb_list(ha);
if (status == QLA_ERROR) {
- DEBUG2(printk("%s(%ld) Error occurred during build"
+ DEBUG2(printk("%s(%ld) Error occurred during build "
"ddb list\n", __func__, ha->host_no));
goto exit_init_hba;
}
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 89460d2..7aa64ca 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1016,7 +1016,7 @@ static void qla4xxx_do_dpc(struct work_struct *work)
struct ddb_entry *ddb_entry, *dtemp;
int status = QLA_ERROR;
- DEBUG2(printk("scsi%ld: %s: DPC handler waking up."
+ DEBUG2(printk("scsi%ld: %s: DPC handler waking up. "
"flags = 0x%08lx, dpc_flags = 0x%08lx ctrl_stat = 0x%08x\n",
ha->host_no, __func__, ha->flags, ha->dpc_flags,
readw(&ha->reg->ctrl_status)));
@@ -1563,7 +1563,7 @@ static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)
cmd->device->channel, cmd->device->id, cmd->device->lun);
DEBUG2(printk(KERN_INFO
- "scsi%ld: DEVICE_RESET cmd=%p jiffies = 0x%lx, to=%x,"
+ "scsi%ld: DEVICE_RESET cmd=%p jiffies = 0x%lx, to=%x, "
"dpc_flags=%lx, status=%x allowed=%d\n", ha->host_no,
cmd, jiffies, cmd->timeout_per_command / HZ,
ha->dpc_flags, cmd->result, cmd->allowed));
--
1.5.3.5.652.gf192c
Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/3c507.c | 4 ++--
drivers/net/amd8111e.c | 4 ++--
drivers/net/at1700.c | 2 +-
drivers/net/pppol2tp.c | 2 +-
drivers/net/qla3xxx.c | 2 +-
drivers/net/rrunner.c | 2 +-
drivers/net/s2io.c | 6 +++---
drivers/net/sis900.c | 6 +++---
drivers/net/smc9194.c | 2 +-
drivers/net/via-rhine.c | 2 +-
10 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index 964d31a..f90ede9 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -747,7 +747,7 @@ static void init_82586_mem(struct net_device *dev)
int boguscnt = 50;
while (readw(shmem+iSCB_STATUS) == 0)
if (--boguscnt == 0) {
- printk("%s: i82586 initialization timed out with status %04x,"
+ printk("%s: i82586 initialization timed out with status %04x, "
"cmd %04x.\n", dev->name,
readw(shmem+iSCB_STATUS), readw(shmem+iSCB_CMD));
break;
@@ -832,7 +832,7 @@ static void el16_rx(struct net_device *dev)
if (rfd_cmd != 0 || data_buffer_addr != rx_head + 22
|| (pkt_len & 0xC000) != 0xC000) {
- printk("%s: Rx frame at %#x corrupted, status %04x cmd %04x"
+ printk("%s: Rx frame at %#x corrupted, status %04x cmd %04x "
"next %04x data-buf @%04x %04x.\n", dev->name, rx_head,
frame_status, rfd_cmd, next_rx_frame, data_buffer_addr,
pkt_len);
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index eebf5bb..3430cc3 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1939,13 +1939,13 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
err = pci_enable_device(pdev);
if(err){
- printk(KERN_ERR "amd8111e: Cannot enable new PCI device,"
+ printk(KERN_ERR "amd8111e: Cannot enable new PCI device, "
"exiting.\n");
return err;
}
if(!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)){
- printk(KERN_ERR "amd8111e: Cannot find PCI base address"
+ printk(KERN_ERR "amd8111e: Cannot find PCI base address, "
"exiting.\n");
err = -ENODEV;
goto err_disable_pdev;
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index b032c1b..9704171 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -465,7 +465,7 @@ found:
/* Snarf the interrupt vector now. */
ret = request_irq(irq, &net_interrupt, 0, DRV_NAME, dev);
if (ret) {
- printk (" AT1700 at %#3x is unusable due to a conflict on"
+ printk (" AT1700 at %#3x is unusable due to a conflict on "
"IRQ %d.\n", ioaddr, irq);
goto err_mca;
}
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index a7556cd..1b51bb6 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -2489,7 +2489,7 @@ static void __exit pppol2tp_exit(void)
module_init(pppol2tp_init);
module_exit(pppol2tp_exit);
-MODULE_AUTHOR("Martijn van Oosterhout <[email protected]>,"
+MODULE_AUTHOR("Martijn van Oosterhout <[email protected]>, "
"James Chapman <[email protected]>");
MODULE_DESCRIPTION("PPP over L2TP over UDP");
MODULE_LICENSE("GPL");
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index a579111..4f5d3d4 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -711,7 +711,7 @@ static int ql_mii_write_reg_ex(struct ql3_adapter *qdev,
if (ql_wait_for_mii_ready(qdev)) {
if (netif_msg_link(qdev))
printk(KERN_WARNING PFX
- "%s: Timed out waiting for management port to"
+ "%s: Timed out waiting for management port to "
"get free before issuing command.\n",
qdev->ndev->name);
return -1;
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 73a7e65..379ded5 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -878,7 +878,7 @@ static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
dev->name);
goto drop;
case E_FLG_SYN_ERR:
- printk(KERN_WARNING "%s: Flag sync. lost during"
+ printk(KERN_WARNING "%s: Flag sync. lost during "
"packet\n", dev->name);
goto drop;
case E_RX_INV_BUF:
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 6326667..8aff21c 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3762,7 +3762,7 @@ static int __devinit s2io_test_msi(struct s2io_nic *sp)
if (!sp->msi_detected) {
/* MSI(X) test failed, go back to INTx mode */
- DBG_PRINT(ERR_DBG, "%s: PCI %s: No interrupt was generated"
+ DBG_PRINT(ERR_DBG, "%s: PCI %s: No interrupt was generated "
"using MSI(X) during test\n", sp->dev->name,
pci_name(pdev));
@@ -6705,7 +6705,7 @@ static int s2io_add_isr(struct s2io_nic * sp)
/* If either data or addr is zero print it */
if(!(sp->msix_info[i].addr &&
sp->msix_info[i].data)) {
- DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx"
+ DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx "
"Data:0x%lx\n",sp->desc[i],
(unsigned long long)
sp->msix_info[i].addr,
@@ -6723,7 +6723,7 @@ static int s2io_add_isr(struct s2io_nic * sp)
/* If either data or addr is zero print it */
if(!(sp->msix_info[i].addr &&
sp->msix_info[i].data)) {
- DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx"
+ DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx "
"Data:0x%lx\n",sp->desc[i],
(unsigned long long)
sp->msix_info[i].addr,
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 0857d2c..ec95e49 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -419,7 +419,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
i = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK);
if(i){
- printk(KERN_ERR "sis900.c: architecture does not support"
+ printk(KERN_ERR "sis900.c: architecture does not support "
"32bit PCI busmaster DMA\n");
return i;
}
@@ -1667,7 +1667,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance)
/* something strange happened !!! */
if (status & HIBERR) {
if(netif_msg_intr(sis_priv))
- printk(KERN_INFO "%s: Abnormal interrupt,"
+ printk(KERN_INFO "%s: Abnormal interrupt, "
"status %#8.8x.\n", net_dev->name, status);
break;
}
@@ -1820,7 +1820,7 @@ refill_rx_ring:
* how the hardware will react to this kind
* of degenerated buffer */
if (netif_msg_rx_err(sis_priv))
- printk(KERN_INFO "%s: Memory squeeze,"
+ printk(KERN_INFO "%s: Memory squeeze, "
"deferring packet.\n",
net_dev->name);
net_dev->stats.rx_dropped++;
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c
index cb2698d..de67744 100644
--- a/drivers/net/smc9194.c
+++ b/drivers/net/smc9194.c
@@ -906,7 +906,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
SMC_SELECT_BANK(1);
base_address_register = inw( ioaddr + BASE );
if ( ioaddr != ( base_address_register >> 3 & 0x3E0 ) ) {
- printk(CARDNAME ": IOADDR %x doesn't match configuration (%x)."
+ printk(CARDNAME ": IOADDR %x doesn't match configuration (%x). "
"Probably not a SMC chip\n",
ioaddr, base_address_register >> 3 & 0x3E0 );
/* well, the base address register didn't match. Must not have
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 07263cd..87c180b 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -1338,7 +1338,7 @@ static irqreturn_t rhine_interrupt(int irq, void *dev_instance)
if (debug > 2 &&
ioread8(ioaddr+ChipCmd) & CmdTxOn)
printk(KERN_WARNING "%s: "
- "rhine_interrupt() Tx engine"
+ "rhine_interrupt() Tx engine "
"still on.\n", dev->name);
}
rhine_tx(dev);
--
1.5.3.5.652.gf192c
On Mon, Nov 19, 2007 at 05:48:01PM -0800, Joe Perches wrote:
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
Thanks Joe, applied.
Dave
--
http://www.codemonkey.org.uk
On Mon, Nov 19, 2007 at 05:48:06PM -0800, Joe Perches wrote:
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/cpufreq/cpufreq.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
Also applied, thanks.
Dave
--
http://www.codemonkey.org.uk
applied.
thanks,
-len
On Monday 19 November 2007 20:48, Joe Perches wrote:
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/acpi/ec.c | 4 ++--
> drivers/acpi/processor_core.c | 2 +-
> drivers/acpi/tables/tbutils.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
> index 06b78e5..cb09e5e 100644
> --- a/drivers/acpi/ec.c
> +++ b/drivers/acpi/ec.c
> @@ -175,12 +175,12 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
> if (acpi_ec_check_status(ec, event)) {
> if (event == ACPI_EC_EVENT_OBF_1) {
> /* miss OBF = 1 GPE, don't expect it anymore */
> - printk(KERN_INFO PREFIX "missing OBF_1 confirmation,"
> + printk(KERN_INFO PREFIX "missing OBF_1 confirmation, "
> "switching to degraded mode.\n");
> set_bit(EC_FLAGS_ONLY_IBF_GPE, &ec->flags);
> } else {
> /* missing GPEs, switch back to poll mode */
> - printk(KERN_INFO PREFIX "missing IBF_1 confirmations,"
> + printk(KERN_INFO PREFIX "missing IBF_1 confirmations, "
> "switch off interrupt mode.\n");
> clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
> }
> diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
> index 235a51e..44156e7 100644
> --- a/drivers/acpi/processor_core.c
> +++ b/drivers/acpi/processor_core.c
> @@ -647,7 +647,7 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
> */
> if (processor_device_array[pr->id] != NULL &&
> processor_device_array[pr->id] != device) {
> - printk(KERN_WARNING "BIOS reported wrong ACPI id"
> + printk(KERN_WARNING "BIOS reported wrong ACPI id "
> "for the processor\n");
> return -ENODEV;
> }
> diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
> index 5f1d85f..010f196 100644
> --- a/drivers/acpi/tables/tbutils.c
> +++ b/drivers/acpi/tables/tbutils.c
> @@ -449,7 +449,7 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
> /* XSDT has NULL entry, RSDT is used */
> address = rsdt_address;
> table_entry_size = sizeof(u32);
> - ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry,"
> + ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry, "
> "using RSDT"));
> }
> }
[snip]
> diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
> index 5fd65d8..90518e4 100644
> --- a/arch/ia64/kernel/kprobes.c
> +++ b/arch/ia64/kernel/kprobes.c
> @@ -182,8 +182,8 @@ static int __kprobes unsupported_inst(uint template, uint slot,
> qp = kprobe_inst & 0x3f;
> if (is_cmp_ctype_unc_inst(template, slot, major_opcode, kprobe_inst)) {
> if (slot == 1 && qp) {
> - printk(KERN_WARNING "Kprobes on cmp unc"
> - "instruction on slot 1 at <0x%lx>"
> + printk(KERN_WARNING "Kprobes on cmp unc "
> + "instruction on slot 1 at <0x%lx> "
> "is not supported\n", addr);
> return -EINVAL;
>
> @@ -221,8 +221,8 @@ static int __kprobes unsupported_inst(uint template, uint slot,
> * bit 12 to be equal to 1
> */
> if (slot == 1 && qp) {
> - printk(KERN_WARNING "Kprobes on test bit"
> - "instruction on slot at <0x%lx>"
> + printk(KERN_WARNING "Kprobes on test bit "
> + "instruction on slot at <0x%lx> "
> "is not supported\n", addr);
> return -EINVAL;
> }
Is it really neccessary for this fragment to create a line that
is greater than 80 characters long? Persumably the entire reason
that the printk line was split in the first place was to avoid
a long line.
[snip]
--
Horms
On Tue, 2007-11-20 at 15:54 +0900, Simon Horman wrote:
> Is it really neccessary for this fragment to create a line that
> is greater than 80 characters long? Persumably the entire reason
> that the printk line was split in the first place was to avoid
> a long line.
No. Many other lines in that source file are > 80 char.
My initial preference was to reformat the indented lines to the
printk open parenthesis, but the minimal change seemed better.
cheers, Joe
On Mon, Nov 19, 2007 at 11:09:25PM -0800, Joe Perches wrote:
> On Tue, 2007-11-20 at 15:54 +0900, Simon Horman wrote:
> > Is it really neccessary for this fragment to create a line that
> > is greater than 80 characters long? Persumably the entire reason
> > that the printk line was split in the first place was to avoid
> > a long line.
>
> No. Many other lines in that source file are > 80 char.
That may be so, but surely adding another one makes
things slightly worse.
> My initial preference was to reformat the indented lines to the
> printk open parenthesis, but the minimal change seemed better.
>
> cheers, Joe
--
Horms
From: Joe Perches <[email protected]>
Date: Mon, 19 Nov 2007 17:47:59 -0800
>
> Signed-off-by: Joe Perches <[email protected]>
Applied.
From: Joe Perches <[email protected]>
Date: Mon, 19 Nov 2007 17:47:58 -0800
> Signed-off-by: Joe Perches <[email protected]>
Please check your patches, for trailing white "space".
Adds trailing whitespace.
diff:10: prom_printf("PCIC: Error, cannot map "
Adds trailing whitespace.
diff:19: prom_printf("PCIC: Error, cannot map "
warning: 2 lines add whitespace errors.
I've fixed it up this time.
On Mon, 2007-11-19 at 23:45 -0800, David Miller wrote:
> From: Joe Perches <[email protected]>
> Date: Mon, 19 Nov 2007 17:47:58 -0800
> > Signed-off-by: Joe Perches <[email protected]>
> Please check your patches, for trailing white "space".
> Adds trailing whitespace.
> diff:10: prom_printf("PCIC: Error, cannot map "
> Adds trailing whitespace.
> diff:19: prom_printf("PCIC: Error, cannot map "
> warning: 2 lines add whitespace errors.
> I've fixed it up this time.
It doesn't add whitespace, but it does keep the trailing
whitespace that's already there.
cheers, Joe
From: Joe Perches <[email protected]>
Date: Mon, 19 Nov 2007 23:48:36 -0800
> On Mon, 2007-11-19 at 23:45 -0800, David Miller wrote:
> > From: Joe Perches <[email protected]>
> > Date: Mon, 19 Nov 2007 17:47:58 -0800
> > > Signed-off-by: Joe Perches <[email protected]>
> > Please check your patches, for trailing white "space".
> > Adds trailing whitespace.
> > diff:10: prom_printf("PCIC: Error, cannot map "
> > Adds trailing whitespace.
> > diff:19: prom_printf("PCIC: Error, cannot map "
> > warning: 2 lines add whitespace errors.
> > I've fixed it up this time.
>
> It doesn't add whitespace, but it does keep the trailing
> whitespace that's already there.
I know that, you should still do sanity checks and fix these kinds of
things up because they trigger errors in my patch applying scripts and
that of many other developers.
On Mon, Nov 19, 2007 at 05:47:57PM -0800, Joe Perches wrote:
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> arch/s390/crypto/aes_s390.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
> index 5126696..e2f6216 100644
> --- a/arch/s390/crypto/aes_s390.c
> +++ b/arch/s390/crypto/aes_s390.c
> @@ -341,7 +341,7 @@ static int __init aes_init(void)
> ecb_aes_alg.cra_u.blkcipher.max_keysize = AES_MIN_KEY_SIZE;
> cbc_aes_alg.cra_u.blkcipher.max_keysize = AES_MIN_KEY_SIZE;
> printk(KERN_INFO
> - "aes_s390: hardware acceleration only available for"
> + "aes_s390: hardware acceleration only available for "
> "128 bit keys\n");
Applied. Thanks!
On Mon, Nov 19, 2007 at 05:48:31PM -0800, Joe Perches wrote:
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/s390/char/monwriter.c | 2 +-
> drivers/s390/char/vmlogrdr.c | 2 +-
> drivers/s390/cio/chsc.c | 2 +-
> drivers/s390/net/claw.c | 2 +-
> drivers/s390/net/lcs.c | 2 +-
> drivers/s390/scsi/zfcp_fsf.c | 10 +++++-----
> 6 files changed, 10 insertions(+), 10 deletions(-)
Applied as well. Thanks.
On Mon, 2007-11-19 at 17:48 -0800, Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/net/wireless/b43/phy.c | 2 +-
> drivers/net/wireless/b43legacy/phy.c | 2 +-
> drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 2 +-
> drivers/net/wireless/libertas/wext.c | 2 +-
> drivers/net/wireless/netwave_cs.c | 2 +-
> drivers/net/wireless/p54usb.c | 2 +-
> 6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/b43/phy.c b/drivers/net/wireless/b43/phy.c
> index 3d4ed64..7ff091e 100644
> --- a/drivers/net/wireless/b43/phy.c
> +++ b/drivers/net/wireless/b43/phy.c
> @@ -2214,7 +2214,7 @@ int b43_phy_init_tssi2dbm_table(struct b43_wldev *dev)
> }
> dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
> if (dyn_tssi2dbm == NULL) {
> - b43err(dev->wl, "Could not allocate memory"
> + b43err(dev->wl, "Could not allocate memory "
> "for tssi2dbm table\n");
> return -ENOMEM;
> }
> diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c
> index 22a4b3d..491e518 100644
> --- a/drivers/net/wireless/b43legacy/phy.c
> +++ b/drivers/net/wireless/b43legacy/phy.c
> @@ -2020,7 +2020,7 @@ int b43legacy_phy_init_tssi2dbm_table(struct b43legacy_wldev *dev)
> phy->idle_tssi = 62;
> dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
> if (dyn_tssi2dbm == NULL) {
> - b43legacyerr(dev->wl, "Could not allocate memory"
> + b43legacyerr(dev->wl, "Could not allocate memory "
> "for tssi2dbm table\n");
> return -ENOMEM;
> }
> diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
> index b37f1e3..af3de33 100644
> --- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
> +++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
> @@ -2149,7 +2149,7 @@ int bcm43xx_phy_init_tssi2dbm_table(struct bcm43xx_private *bcm)
> }
> dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
> if (dyn_tssi2dbm == NULL) {
> - printk(KERN_ERR PFX "Could not allocate memory"
> + printk(KERN_ERR PFX "Could not allocate memory "
> "for tssi2dbm table\n");
> return -ENOMEM;
> }
> diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
> index c6f5aa3..395b788 100644
> --- a/drivers/net/wireless/libertas/wext.c
> +++ b/drivers/net/wireless/libertas/wext.c
> @@ -1528,7 +1528,7 @@ static int wlan_set_encodeext(struct net_device *dev,
> && (ext->key_len != KEY_LEN_WPA_TKIP))
> || ((alg == IW_ENCODE_ALG_CCMP)
> && (ext->key_len != KEY_LEN_WPA_AES))) {
> - lbs_deb_wext("invalid size %d for key of alg"
> + lbs_deb_wext("invalid size %d for key of alg "
> "type %d\n",
> ext->key_len,
> alg);
Acked-by: Dan Williams <[email protected]>
> diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
> index 2402cb8..d2fa079 100644
> --- a/drivers/net/wireless/netwave_cs.c
> +++ b/drivers/net/wireless/netwave_cs.c
> @@ -806,7 +806,7 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
> for (i = 0; i < 6; i++)
> dev->dev_addr[i] = readb(ramBase + NETWAVE_EREG_PA + i);
>
> - printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx"
> + printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx, "
> "id %c%c, hw_addr %s\n",
> dev->name, dev->base_addr, dev->irq,
> (u_long) ramBase,
> diff --git a/drivers/net/wireless/p54usb.c b/drivers/net/wireless/p54usb.c
> index 755482a..60d286e 100644
> --- a/drivers/net/wireless/p54usb.c
> +++ b/drivers/net/wireless/p54usb.c
> @@ -308,7 +308,7 @@ static int p54u_read_eeprom(struct ieee80211_hw *dev)
>
> buf = kmalloc(0x2020, GFP_KERNEL);
> if (!buf) {
> - printk(KERN_ERR "prism54usb: cannot allocate memory for"
> + printk(KERN_ERR "prism54usb: cannot allocate memory for "
> "eeprom readback!\n");
> return -ENOMEM;
> }
Hi Joe,
On Mon, 19 Nov 2007 17:48:08 -0800, Joe Perches wrote:
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/i2c/busses/i2c-davinci.c | 4 ++--
> drivers/i2c/busses/i2c-omap.c | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
> (...)
Good catch. Patch applied, thanks.
--
Jean Delvare
Joe Perches <[email protected]> writes:
> --- a/drivers/net/wan/wanxl.c
> +++ b/drivers/net/wan/wanxl.c
> @@ -743,7 +743,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
> }while (time_after(timeout, jiffies));
>
> if (!stat) {
> - printk(KERN_WARNING "wanXL %s: timeout while initializing card"
> + printk(KERN_WARNING "wanXL %s: timeout while initializing card "
> "firmware\n", pci_name(pdev));
> wanxl_pci_remove_one(pdev);
> return -ENODEV;
Acked-by: Krzysztof Halasa <[email protected]>
Thanks.
--
Krzysztof Halasa
Hi Joe,
On Mon, 19 Nov 2007 17:48:07 -0800, Joe Perches wrote:
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/hwmon/vt8231.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
> index 2196a84..f876617 100644
> --- a/drivers/hwmon/vt8231.c
> +++ b/drivers/hwmon/vt8231.c
> @@ -504,7 +504,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
> case 4: data->fan_div[nr] = 2; break;
> case 8: data->fan_div[nr] = 3; break;
> default:
> - dev_err(dev, "fan_div value %ld not supported."
> + dev_err(dev, "fan_div value %ld not supported. "
> "Choose one of 1, 2, 4 or 8!\n", val);
> mutex_unlock(&data->update_lock);
> return -EINVAL;
Obviously correct, thanks.
Acked-by: Jean Delvare <[email protected]>
--
Jean Delvare
On Mon, Nov 19, 2007 at 05:47:54PM -0800, Joe Perches wrote:
Queued for 2.6.25.
Thanks,
Ralf
Joe Perches wrote:
> drivers/ieee1394/raw1394.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
...
> - DBGMSG("arm_read called by node: %X"
> + DBGMSG("arm_read called by node: %X "
...
Committed to linux1394-2.6.git. Thanks,
--
Stefan Richter
-=====-=-=== =-== =-==-
http://arcgraph.de/sr/
On Tuesday 20 November 2007, Joe Perches wrote:
>
> Signed-off-by: Joe Perches <[email protected]>
applied
Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/net/chelsio/cxgb2.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
appied 29-36 to netdev#upstream
Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/net/ixgbe/ixgbe_common.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
> index 512e3b2..b7e50bc 100644
> --- a/drivers/net/ixgbe/ixgbe_common.c
> +++ b/drivers/net/ixgbe/ixgbe_common.c
> @@ -950,7 +950,7 @@ s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)
> u32 rmcs_reg;
>
> if (packetbuf_num < 0 || packetbuf_num > 7)
> - hw_dbg(hw, "Invalid packet buffer number [%d], expected range"
> + hw_dbg(hw, "Invalid packet buffer number [%d], expected range "
> "is 0-7\n", packetbuf_num);
>
> frctl_reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);
Jeff, please apply in case you didn't do so yet.
Acked-by: Auke Kok <[email protected]>
Auke
* Joe Perches <[email protected]> [2007-11-19 17:48:07 -0800]:
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/hwmon/vt8231.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
> index 2196a84..f876617 100644
> --- a/drivers/hwmon/vt8231.c
> +++ b/drivers/hwmon/vt8231.c
> @@ -504,7 +504,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
> case 4: data->fan_div[nr] = 2; break;
> case 8: data->fan_div[nr] = 3; break;
> default:
> - dev_err(dev, "fan_div value %ld not supported."
> + dev_err(dev, "fan_div value %ld not supported. "
> "Choose one of 1, 2, 4 or 8!\n", val);
> mutex_unlock(&data->update_lock);
> return -EINVAL;
> --
> 1.5.3.5.652.gf192c
Applied to hwmon-2.6.git/testing, thanks.
--
Mark M. Hoffman
[email protected]