tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ipwireless: Glue splitted printk strings back

ipwireless: Glue splitted printk strings back

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

David Sterba and committed by
Linus Torvalds 622e713e 2fc5577e

+12 -18
+5 -10
drivers/char/pcmcia/ipwireless/hardware.c
··· 79 79 timing_stats.last_report_time = jiffies; 80 80 if (!first) 81 81 printk(KERN_INFO IPWIRELESS_PCCARD_NAME 82 - ": %u us elapsed - read %lu bytes in %u us, " 83 - "wrote %lu bytes in %u us\n", 82 + ": %u us elapsed - read %lu bytes in %u us, wrote %lu bytes in %u us\n", 84 83 jiffies_to_usecs(since), 85 84 timing_stats.read_bytes, 86 85 jiffies_to_usecs(timing_stats.read_time), ··· 845 846 len = inw(hw->base_port + IODRR); 846 847 if (len > hw->ll_mtu) { 847 848 printk(KERN_INFO IPWIRELESS_PCCARD_NAME 848 - ": received a packet of %u bytes - " 849 - "longer than the MTU!\n", len); 849 + ": received a packet of %u bytes - longer than the MTU!\n", len); 850 850 outw(DCR_RXDONE | DCR_RXRESET, hw->base_port + IODCR); 851 851 return; 852 852 } ··· 861 863 len = inw(hw->base_port); 862 864 if (len > hw->ll_mtu) { 863 865 printk(KERN_INFO IPWIRELESS_PCCARD_NAME 864 - ": received a packet of %u bytes - " 865 - "longer than the MTU!\n", len); 866 + ": received a packet of %u bytes - longer than the MTU!\n", len); 866 867 writew(MEMRX_PCINTACKK, 867 868 &hw->memory_info_regs->memreg_pc_interrupt_ack); 868 869 return; ··· 1177 1180 ": spurious interrupt - new_tx mode\n"); 1178 1181 else { 1179 1182 printk(KERN_WARNING IPWIRELESS_PCCARD_NAME 1180 - ": no valid memreg_tx value - " 1181 - "switching to the old memreg_tx\n"); 1183 + ": no valid memreg_tx value - switching to the old memreg_tx\n"); 1182 1184 hw->memreg_tx = 1183 1185 &hw->memory_info_regs->memreg_tx_old; 1184 1186 try_mem_tx_old = 1; ··· 1483 1487 if (vers_no == TL_SETUP_VERSION) 1484 1488 __handle_setup_get_version_rsp(hw); 1485 1489 else 1486 - printk(KERN_ERR 1487 - IPWIRELESS_PCCARD_NAME 1490 + printk(KERN_ERR IPWIRELESS_PCCARD_NAME 1488 1491 ": invalid hardware version no %u\n", 1489 1492 (unsigned int) vers_no); 1490 1493 }
+7 -8
drivers/char/pcmcia/ipwireless/main.c
··· 311 311 (unsigned int) link->irq.AssignedIRQ); 312 312 if (ipw->attr_memory && ipw->common_memory) 313 313 printk(KERN_INFO IPWIRELESS_PCCARD_NAME 314 - ": attr memory 0x%08lx-0x%08lx, " 315 - "common memory 0x%08lx-0x%08lx\n", 316 - request_attr_memory.Base, 317 - request_attr_memory.Base 318 - + request_attr_memory.Size - 1, 319 - request_common_memory.Base, 320 - request_common_memory.Base 321 - + request_common_memory.Size - 1); 314 + ": attr memory 0x%08lx-0x%08lx, common memory 0x%08lx-0x%08lx\n", 315 + request_attr_memory.Base, 316 + request_attr_memory.Base 317 + + request_attr_memory.Size - 1, 318 + request_common_memory.Base, 319 + request_common_memory.Base 320 + + request_common_memory.Size - 1); 322 321 323 322 ipw->network = ipwireless_network_create(ipw->hardware); 324 323 if (!ipw->network)