diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/3c507.c | 4 | ||||
-rw-r--r-- | drivers/net/amd8111e.c | 4 | ||||
-rw-r--r-- | drivers/net/at1700.c | 2 | ||||
-rw-r--r-- | drivers/net/pppol2tp.c | 2 | ||||
-rw-r--r-- | drivers/net/qla3xxx.c | 2 | ||||
-rw-r--r-- | drivers/net/rrunner.c | 2 | ||||
-rw-r--r-- | drivers/net/s2io.c | 6 | ||||
-rw-r--r-- | drivers/net/sis900.c | 6 | ||||
-rw-r--r-- | drivers/net/smc9194.c | 2 | ||||
-rw-r--r-- | 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 964d31ac944..f90ede93148 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 e7fdd81919b..85f7276aaba 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c @@ -1945,13 +1945,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 b032c1bf492..97041715e8c 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 a7556cd2df7..1b51bb668d3 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 <kleptog@svana.org>," +MODULE_AUTHOR("Martijn van Oosterhout <kleptog@svana.org>, " "James Chapman <jchapman@katalix.com>"); MODULE_DESCRIPTION("PPP over L2TP over UDP"); MODULE_LICENSE("GPL"); diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index cf0774de6c4..00f2fddff1f 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 55a590ab1e1..3dd8f1342f7 100644 --- a/drivers/net/rrunner.c +++ b/drivers/net/rrunner.c @@ -877,7 +877,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 644d71bfb64..5defb0b1725 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -3772,7 +3772,7 @@ static int 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)); @@ -6868,7 +6868,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, @@ -6886,7 +6886,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 0857d2c88aa..ec95e493ac1 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 cb2698de519..de67744c4a2 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 07263cd93f9..87c180b563d 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); |