aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2010-03-24 03:57:36 -0400
committerDavid S. Miller <davem@davemloft.net>2010-03-24 17:10:38 -0400
commit2381a55c88453d3f29fe62d235579a05fc20b7b3 (patch)
treeb962ee6d3f5260622504433ef6a485703d3da8dd
parentd6dbee861386cd3f4cee62bcf28597e63e251e0c (diff)
net/various: remove trailing space in messages
Signed-off-by: Frans Pop <elendil@planet.nl> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat
-rw-r--r--drivers/net/benet/be_ethtool.c2
-rw-r--r--drivers/net/benet/be_main.c2
-rw-r--r--drivers/net/bnx2x_link.c12
-rw-r--r--drivers/net/bonding/bond_main.c4
-rw-r--r--drivers/net/dnet.c2
-rw-r--r--drivers/net/hamradio/baycom_ser_fdx.c2
-rw-r--r--drivers/net/mlx4/en_netdev.c2
-rw-r--r--drivers/net/qla3xxx.c2
-rw-r--r--drivers/net/qlge/qlge_dbg.c4
-rw-r--r--drivers/net/sis900.c4
-rw-r--r--drivers/net/skfp/fplustm.c2
-rw-r--r--drivers/net/skfp/pcmplc.c4
-rw-r--r--drivers/net/skfp/srf.c2
-rw-r--r--drivers/net/skge.c2
-rw-r--r--drivers/net/stmmac/dwmac100.c2
-rw-r--r--drivers/net/stmmac/stmmac_main.c2
-rw-r--r--drivers/net/tlan.c2
-rw-r--r--drivers/net/tsi108_eth.c6
-rw-r--r--drivers/net/ucc_geth.c2
-rw-r--r--drivers/net/vxge/vxge-main.c2
-rw-r--r--drivers/net/wan/pc300_drv.c2
-rw-r--r--drivers/net/wan/pc300_tty.c2
-rw-r--r--drivers/net/wan/sdla.c2
-rw-r--r--drivers/net/wimax/i2400m/tx.c2
24 files changed, 35 insertions, 35 deletions
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 9560d48944ab..d7390da470cd 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -496,7 +496,7 @@ be_test_ddr_dma(struct be_adapter *adapter)
496 ddrdma_cmd.va = pci_alloc_consistent(adapter->pdev, ddrdma_cmd.size, 496 ddrdma_cmd.va = pci_alloc_consistent(adapter->pdev, ddrdma_cmd.size,
497 &ddrdma_cmd.dma); 497 &ddrdma_cmd.dma);
498 if (!ddrdma_cmd.va) { 498 if (!ddrdma_cmd.va) {
499 dev_err(&adapter->pdev->dev, "Memory allocation failure \n"); 499 dev_err(&adapter->pdev->dev, "Memory allocation failure\n");
500 return -ENOMEM; 500 return -ENOMEM;
501 } 501 }
502 502
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 174e5f899609..50ea0561ecc7 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -1749,7 +1749,7 @@ static int be_setup_wol(struct be_adapter *adapter, bool enable)
1749 PCICFG_PM_CONTROL_OFFSET, PCICFG_PM_CONTROL_MASK); 1749 PCICFG_PM_CONTROL_OFFSET, PCICFG_PM_CONTROL_MASK);
1750 if (status) { 1750 if (status) {
1751 dev_err(&adapter->pdev->dev, 1751 dev_err(&adapter->pdev->dev,
1752 "Could not enable Wake-on-lan \n"); 1752 "Could not enable Wake-on-lan\n");
1753 pci_free_consistent(adapter->pdev, cmd.size, cmd.va, 1753 pci_free_consistent(adapter->pdev, cmd.size, cmd.va,
1754 cmd.dma); 1754 cmd.dma);
1755 return status; 1755 return status;
diff --git a/drivers/net/bnx2x_link.c b/drivers/net/bnx2x_link.c
index 32e79c359e89..ff70be898765 100644
--- a/drivers/net/bnx2x_link.c
+++ b/drivers/net/bnx2x_link.c
@@ -1594,7 +1594,7 @@ static u8 bnx2x_ext_phy_resolve_fc(struct link_params *params,
1594 MDIO_AN_REG_ADV_PAUSE_MASK) >> 8; 1594 MDIO_AN_REG_ADV_PAUSE_MASK) >> 8;
1595 pause_result |= (lp_pause & 1595 pause_result |= (lp_pause &
1596 MDIO_AN_REG_ADV_PAUSE_MASK) >> 10; 1596 MDIO_AN_REG_ADV_PAUSE_MASK) >> 10;
1597 DP(NETIF_MSG_LINK, "Ext PHY pause result 0x%x \n", 1597 DP(NETIF_MSG_LINK, "Ext PHY pause result 0x%x\n",
1598 pause_result); 1598 pause_result);
1599 bnx2x_pause_resolve(vars, pause_result); 1599 bnx2x_pause_resolve(vars, pause_result);
1600 if (vars->flow_ctrl == BNX2X_FLOW_CTRL_NONE && 1600 if (vars->flow_ctrl == BNX2X_FLOW_CTRL_NONE &&
@@ -1616,7 +1616,7 @@ static u8 bnx2x_ext_phy_resolve_fc(struct link_params *params,
1616 MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) >> 7; 1616 MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) >> 7;
1617 1617
1618 bnx2x_pause_resolve(vars, pause_result); 1618 bnx2x_pause_resolve(vars, pause_result);
1619 DP(NETIF_MSG_LINK, "Ext PHY CL37 pause result 0x%x \n", 1619 DP(NETIF_MSG_LINK, "Ext PHY CL37 pause result 0x%x\n",
1620 pause_result); 1620 pause_result);
1621 } 1621 }
1622 } 1622 }
@@ -1974,7 +1974,7 @@ static u8 bnx2x_link_settings_status(struct link_params *params,
1974 } 1974 }
1975 } 1975 }
1976 1976
1977 DP(NETIF_MSG_LINK, "gp_status 0x%x phy_link_up %x line_speed %x \n", 1977 DP(NETIF_MSG_LINK, "gp_status 0x%x phy_link_up %x line_speed %x\n",
1978 gp_status, vars->phy_link_up, vars->line_speed); 1978 gp_status, vars->phy_link_up, vars->line_speed);
1979 DP(NETIF_MSG_LINK, "duplex %x flow_ctrl 0x%x" 1979 DP(NETIF_MSG_LINK, "duplex %x flow_ctrl 0x%x"
1980 " autoneg 0x%x\n", 1980 " autoneg 0x%x\n",
@@ -3852,7 +3852,7 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
3852 SPEED_AUTO_NEG) && 3852 SPEED_AUTO_NEG) &&
3853 ((params->speed_cap_mask & 3853 ((params->speed_cap_mask &
3854 PORT_HW_CFG_SPEED_CAPABILITY_D0_1G))) { 3854 PORT_HW_CFG_SPEED_CAPABILITY_D0_1G))) {
3855 DP(NETIF_MSG_LINK, "Setting 1G clause37 \n"); 3855 DP(NETIF_MSG_LINK, "Setting 1G clause37\n");
3856 bnx2x_cl45_write(bp, params->port, ext_phy_type, 3856 bnx2x_cl45_write(bp, params->port, ext_phy_type,
3857 ext_phy_addr, MDIO_AN_DEVAD, 3857 ext_phy_addr, MDIO_AN_DEVAD,
3858 MDIO_AN_REG_ADV, 0x20); 3858 MDIO_AN_REG_ADV, 0x20);
@@ -4234,14 +4234,14 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
4234 ext_phy_addr, 4234 ext_phy_addr,
4235 MDIO_PMA_DEVAD, 4235 MDIO_PMA_DEVAD,
4236 MDIO_PMA_REG_10G_CTRL2, &tmp1); 4236 MDIO_PMA_REG_10G_CTRL2, &tmp1);
4237 DP(NETIF_MSG_LINK, "1.7 = 0x%x \n", tmp1); 4237 DP(NETIF_MSG_LINK, "1.7 = 0x%x\n", tmp1);
4238 4238
4239 } else if ((params->req_line_speed == 4239 } else if ((params->req_line_speed ==
4240 SPEED_AUTO_NEG) && 4240 SPEED_AUTO_NEG) &&
4241 ((params->speed_cap_mask & 4241 ((params->speed_cap_mask &
4242 PORT_HW_CFG_SPEED_CAPABILITY_D0_1G))) { 4242 PORT_HW_CFG_SPEED_CAPABILITY_D0_1G))) {
4243 4243
4244 DP(NETIF_MSG_LINK, "Setting 1G clause37 \n"); 4244 DP(NETIF_MSG_LINK, "Setting 1G clause37\n");
4245 bnx2x_cl45_write(bp, params->port, ext_phy_type, 4245 bnx2x_cl45_write(bp, params->port, ext_phy_type,
4246 ext_phy_addr, MDIO_AN_DEVAD, 4246 ext_phy_addr, MDIO_AN_DEVAD,
4247 MDIO_PMA_REG_8727_MISC_CTRL, 0); 4247 MDIO_PMA_REG_8727_MISC_CTRL, 0);
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index c2aceaab0143..f8ab60b914c4 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4667,13 +4667,13 @@ static int bond_check_params(struct bond_params *params)
4667 } 4667 }
4668 4668
4669 if (num_grat_arp < 0 || num_grat_arp > 255) { 4669 if (num_grat_arp < 0 || num_grat_arp > 255) {
4670 pr_warning("Warning: num_grat_arp (%d) not in range 0-255 so it was reset to 1 \n", 4670 pr_warning("Warning: num_grat_arp (%d) not in range 0-255 so it was reset to 1\n",
4671 num_grat_arp); 4671 num_grat_arp);
4672 num_grat_arp = 1; 4672 num_grat_arp = 1;
4673 } 4673 }
4674 4674
4675 if (num_unsol_na < 0 || num_unsol_na > 255) { 4675 if (num_unsol_na < 0 || num_unsol_na > 255) {
4676 pr_warning("Warning: num_unsol_na (%d) not in range 0-255 so it was reset to 1 \n", 4676 pr_warning("Warning: num_unsol_na (%d) not in range 0-255 so it was reset to 1\n",
4677 num_unsol_na); 4677 num_unsol_na);
4678 num_unsol_na = 1; 4678 num_unsol_na = 1;
4679 } 4679 }
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 234685213f1a..d51a83e69585 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -918,7 +918,7 @@ static int __devinit dnet_probe(struct platform_device *pdev)
918 918
919 dev_info(&pdev->dev, "Dave DNET at 0x%p (0x%08x) irq %d %pM\n", 919 dev_info(&pdev->dev, "Dave DNET at 0x%p (0x%08x) irq %d %pM\n",
920 bp->regs, mem_base, dev->irq, dev->dev_addr); 920 bp->regs, mem_base, dev->irq, dev->dev_addr);
921 dev_info(&pdev->dev, "has %smdio, %sirq, %sgigabit, %sdma \n", 921 dev_info(&pdev->dev, "has %smdio, %sirq, %sgigabit, %sdma\n",
922 (bp->capabilities & DNET_HAS_MDIO) ? "" : "no ", 922 (bp->capabilities & DNET_HAS_MDIO) ? "" : "no ",
923 (bp->capabilities & DNET_HAS_IRQ) ? "" : "no ", 923 (bp->capabilities & DNET_HAS_IRQ) ? "" : "no ",
924 (bp->capabilities & DNET_HAS_GIGABIT) ? "" : "no ", 924 (bp->capabilities & DNET_HAS_GIGABIT) ? "" : "no ",
diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c
index 0cab992b3d1a..3e25f10cabd6 100644
--- a/drivers/net/hamradio/baycom_ser_fdx.c
+++ b/drivers/net/hamradio/baycom_ser_fdx.c
@@ -429,7 +429,7 @@ static int ser12_open(struct net_device *dev)
429 return -EINVAL; 429 return -EINVAL;
430 } 430 }
431 if (!request_region(dev->base_addr, SER12_EXTENT, "baycom_ser_fdx")) { 431 if (!request_region(dev->base_addr, SER12_EXTENT, "baycom_ser_fdx")) {
432 printk(KERN_WARNING "BAYCOM_SER_FSX: I/O port 0x%04lx busy \n", 432 printk(KERN_WARNING "BAYCOM_SER_FSX: I/O port 0x%04lx busy\n",
433 dev->base_addr); 433 dev->base_addr);
434 return -EACCES; 434 return -EACCES;
435 } 435 }
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 7cd0933735e2..5eb96fe6ec5c 100644
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -503,7 +503,7 @@ static void mlx4_en_do_get_stats(struct work_struct *work)
503 503
504 err = mlx4_en_DUMP_ETH_STATS(mdev, priv->port, 0); 504 err = mlx4_en_DUMP_ETH_STATS(mdev, priv->port, 0);
505 if (err) 505 if (err)
506 en_dbg(HW, priv, "Could not update stats \n"); 506 en_dbg(HW, priv, "Could not update stats\n");
507 507
508 mutex_lock(&mdev->state_lock); 508 mutex_lock(&mdev->state_lock);
509 if (mdev->device_up) { 509 if (mdev->device_up) {
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 4ef0afbcbe1b..fc11ad3f64b0 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -2258,7 +2258,7 @@ static int ql_tx_rx_clean(struct ql3_adapter *qdev,
2258 "%x.\n", 2258 "%x.\n",
2259 ndev->name, net_rsp->opcode); 2259 ndev->name, net_rsp->opcode);
2260 printk(KERN_ERR PFX 2260 printk(KERN_ERR PFX
2261 "0x%08lx 0x%08lx 0x%08lx 0x%08lx \n", 2261 "0x%08lx 0x%08lx 0x%08lx 0x%08lx\n",
2262 (unsigned long int)tmp[0], 2262 (unsigned long int)tmp[0],
2263 (unsigned long int)tmp[1], 2263 (unsigned long int)tmp[1],
2264 (unsigned long int)tmp[2], 2264 (unsigned long int)tmp[2],
diff --git a/drivers/net/qlge/qlge_dbg.c b/drivers/net/qlge/qlge_dbg.c
index ff8550d2ca82..947a7aa2400e 100644
--- a/drivers/net/qlge/qlge_dbg.c
+++ b/drivers/net/qlge/qlge_dbg.c
@@ -1338,7 +1338,7 @@ void ql_mpi_core_to_log(struct work_struct *work)
1338 1338
1339 for (i = 0; i < count; i += 8) { 1339 for (i = 0; i < count; i += 8) {
1340 printk(KERN_ERR "%.08x: %.08x %.08x %.08x %.08x %.08x " 1340 printk(KERN_ERR "%.08x: %.08x %.08x %.08x %.08x %.08x "
1341 "%.08x %.08x %.08x \n", i, 1341 "%.08x %.08x %.08x\n", i,
1342 tmp[i + 0], 1342 tmp[i + 0],
1343 tmp[i + 1], 1343 tmp[i + 1],
1344 tmp[i + 2], 1344 tmp[i + 2],
@@ -2056,7 +2056,7 @@ void ql_dump_ob_mac_iocb(struct ob_mac_iocb_req *ob_mac_iocb)
2056 ob_mac_tso_iocb->flags2 & OB_MAC_TSO_IOCB_LSO ? "LSO" : "", 2056 ob_mac_tso_iocb->flags2 & OB_MAC_TSO_IOCB_LSO ? "LSO" : "",
2057 ob_mac_tso_iocb->flags2 & OB_MAC_TSO_IOCB_UC ? "UC" : "", 2057 ob_mac_tso_iocb->flags2 & OB_MAC_TSO_IOCB_UC ? "UC" : "",
2058 ob_mac_tso_iocb->flags2 & OB_MAC_TSO_IOCB_TC ? "TC" : ""); 2058 ob_mac_tso_iocb->flags2 & OB_MAC_TSO_IOCB_TC ? "TC" : "");
2059 printk(KERN_ERR PFX "flags3 = %s %s %s \n", 2059 printk(KERN_ERR PFX "flags3 = %s %s %s\n",
2060 ob_mac_tso_iocb->flags3 & OB_MAC_TSO_IOCB_IC ? "IC" : "", 2060 ob_mac_tso_iocb->flags3 & OB_MAC_TSO_IOCB_IC ? "IC" : "",
2061 ob_mac_tso_iocb->flags3 & OB_MAC_TSO_IOCB_DFP ? "DFP" : "", 2061 ob_mac_tso_iocb->flags3 & OB_MAC_TSO_IOCB_DFP ? "DFP" : "",
2062 ob_mac_tso_iocb->flags3 & OB_MAC_TSO_IOCB_V ? "V" : ""); 2062 ob_mac_tso_iocb->flags3 & OB_MAC_TSO_IOCB_V ? "V" : "");
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index cc0c731c4f09..bc7ff411aad5 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -1499,7 +1499,7 @@ static void sis900_read_mode(struct net_device *net_dev, int *speed, int *duplex
1499 } 1499 }
1500 1500
1501 if(netif_msg_link(sis_priv)) 1501 if(netif_msg_link(sis_priv))
1502 printk(KERN_INFO "%s: Media Link On %s %s-duplex \n", 1502 printk(KERN_INFO "%s: Media Link On %s %s-duplex\n",
1503 net_dev->name, 1503 net_dev->name,
1504 *speed == HW_SPEED_100_MBPS ? 1504 *speed == HW_SPEED_100_MBPS ?
1505 "100mbps" : "10mbps", 1505 "100mbps" : "10mbps",
@@ -1523,7 +1523,7 @@ static void sis900_tx_timeout(struct net_device *net_dev)
1523 int i; 1523 int i;
1524 1524
1525 if(netif_msg_tx_err(sis_priv)) 1525 if(netif_msg_tx_err(sis_priv))
1526 printk(KERN_INFO "%s: Transmit timeout, status %8.8x %8.8x \n", 1526 printk(KERN_INFO "%s: Transmit timeout, status %8.8x %8.8x\n",
1527 net_dev->name, inl(ioaddr + cr), inl(ioaddr + isr)); 1527 net_dev->name, inl(ioaddr + cr), inl(ioaddr + isr));
1528 1528
1529 /* Disable interrupts by clearing the interrupt mask. */ 1529 /* Disable interrupts by clearing the interrupt mask. */
diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c
index 6028bbb3b28a..9d8d1ac48176 100644
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/skfp/fplustm.c
@@ -1352,7 +1352,7 @@ void rtm_set_timer(struct s_smc *smc)
1352 /* 1352 /*
1353 * MIB timer and hardware timer have the same resolution of 80nS 1353 * MIB timer and hardware timer have the same resolution of 80nS
1354 */ 1354 */
1355 DB_RMT("RMT: setting new fddiPATHT_Rmode, t = %d ns \n", 1355 DB_RMT("RMT: setting new fddiPATHT_Rmode, t = %d ns\n",
1356 (int) smc->mib.a[PATH0].fddiPATHT_Rmode,0) ; 1356 (int) smc->mib.a[PATH0].fddiPATHT_Rmode,0) ;
1357 outpd(ADDR(B2_RTM_INI),smc->mib.a[PATH0].fddiPATHT_Rmode) ; 1357 outpd(ADDR(B2_RTM_INI),smc->mib.a[PATH0].fddiPATHT_Rmode) ;
1358} 1358}
diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/skfp/pcmplc.c
index e6b33ee05ede..ba45bc794d77 100644
--- a/drivers/net/skfp/pcmplc.c
+++ b/drivers/net/skfp/pcmplc.c
@@ -1277,7 +1277,7 @@ static void pc_rcode_actions(struct s_smc *smc, int bit, struct s_phy *phy)
1277 1277
1278 mib = phy->mib ; 1278 mib = phy->mib ;
1279 1279
1280 DB_PCMN(1,"SIG rec %x %x: \n", bit,phy->r_val[bit] ) ; 1280 DB_PCMN(1,"SIG rec %x %x:\n", bit,phy->r_val[bit] ) ;
1281 bit++ ; 1281 bit++ ;
1282 1282
1283 switch(bit) { 1283 switch(bit) {
@@ -1580,7 +1580,7 @@ static void pc_tcode_actions(struct s_smc *smc, const int bit, struct s_phy *phy
1580 mib->fddiPORTMacIndicated.T_val = phy->t_val[9] ; 1580 mib->fddiPORTMacIndicated.T_val = phy->t_val[9] ;
1581 break ; 1581 break ;
1582 } 1582 }
1583 DB_PCMN(1,"SIG snd %x %x: \n", bit,phy->t_val[bit] ) ; 1583 DB_PCMN(1,"SIG snd %x %x:\n", bit,phy->t_val[bit] ) ;
1584} 1584}
1585 1585
1586/* 1586/*
diff --git a/drivers/net/skfp/srf.c b/drivers/net/skfp/srf.c
index 6caf713b744c..40882b3faba6 100644
--- a/drivers/net/skfp/srf.c
+++ b/drivers/net/skfp/srf.c
@@ -414,7 +414,7 @@ static void smt_send_srf(struct s_smc *smc)
414 smt->smt_len = SMT_MAX_INFO_LEN - pcon.pc_len ; 414 smt->smt_len = SMT_MAX_INFO_LEN - pcon.pc_len ;
415 mb->sm_len = smt->smt_len + sizeof(struct smt_header) ; 415 mb->sm_len = smt->smt_len + sizeof(struct smt_header) ;
416 416
417 DB_SMT("SRF: sending SRF at %x, len %d \n",smt,mb->sm_len) ; 417 DB_SMT("SRF: sending SRF at %x, len %d\n",smt,mb->sm_len) ;
418 DB_SMT("SRF: state SR%d Threshold %d\n", 418 DB_SMT("SRF: state SR%d Threshold %d\n",
419 smc->srf.sr_state,smc->srf.SRThreshold/TICKS_PER_SECOND) ; 419 smc->srf.sr_state,smc->srf.SRThreshold/TICKS_PER_SECOND) ;
420#ifdef DEBUG 420#ifdef DEBUG
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index d0058e5bb6ae..bd8c5e8413b1 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -3666,7 +3666,7 @@ static int skge_debug_show(struct seq_file *seq, void *v)
3666 t->csum_offs, t->csum_write, t->csum_start); 3666 t->csum_offs, t->csum_write, t->csum_start);
3667 } 3667 }
3668 3668
3669 seq_printf(seq, "\nRx Ring: \n"); 3669 seq_printf(seq, "\nRx Ring:\n");
3670 for (e = skge->rx_ring.to_clean; ; e = e->next) { 3670 for (e = skge->rx_ring.to_clean; ; e = e->next) {
3671 const struct skge_rx_desc *r = e->desc; 3671 const struct skge_rx_desc *r = e->desc;
3672 3672
diff --git a/drivers/net/stmmac/dwmac100.c b/drivers/net/stmmac/dwmac100.c
index 803b0373d843..a183de29c39a 100644
--- a/drivers/net/stmmac/dwmac100.c
+++ b/drivers/net/stmmac/dwmac100.c
@@ -138,7 +138,7 @@ static void dwmac100_dump_dma_regs(unsigned long ioaddr)
138{ 138{
139 int i; 139 int i;
140 140
141 DBG(KERN_DEBUG "DWMAC 100 DMA CSR \n"); 141 DBG(KERN_DEBUG "DWMAC 100 DMA CSR\n");
142 for (i = 0; i < 9; i++) 142 for (i = 0; i < 9; i++)
143 pr_debug("\t CSR%d (offset 0x%x): 0x%08x\n", i, 143 pr_debug("\t CSR%d (offset 0x%x): 0x%08x\n", i,
144 (DMA_BUS_MODE + i * 4), 144 (DMA_BUS_MODE + i * 4),
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index 92bef30de092..963f591f1e0e 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -836,7 +836,7 @@ static int stmmac_open(struct net_device *dev)
836#ifdef CONFIG_STMMAC_TIMER 836#ifdef CONFIG_STMMAC_TIMER
837 priv->tm = kzalloc(sizeof(struct stmmac_timer *), GFP_KERNEL); 837 priv->tm = kzalloc(sizeof(struct stmmac_timer *), GFP_KERNEL);
838 if (unlikely(priv->tm == NULL)) { 838 if (unlikely(priv->tm == NULL)) {
839 pr_err("%s: ERROR: timer memory alloc failed \n", __func__); 839 pr_err("%s: ERROR: timer memory alloc failed\n", __func__);
840 return -ENOMEM; 840 return -ENOMEM;
841 } 841 }
842 priv->tm->freq = tmrate; 842 priv->tm->freq = tmrate;
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index 390540c101c7..05ea30a94e89 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -2464,7 +2464,7 @@ static void TLan_PhyPrint( struct net_device *dev )
2464 printk( "TLAN: Device %s, Unmanaged PHY.\n", dev->name ); 2464 printk( "TLAN: Device %s, Unmanaged PHY.\n", dev->name );
2465 } else if ( phy <= TLAN_PHY_MAX_ADDR ) { 2465 } else if ( phy <= TLAN_PHY_MAX_ADDR ) {
2466 printk( "TLAN: Device %s, PHY 0x%02x.\n", dev->name, phy ); 2466 printk( "TLAN: Device %s, PHY 0x%02x.\n", dev->name, phy );
2467 printk( "TLAN: Off. +0 +1 +2 +3 \n" ); 2467 printk( "TLAN: Off. +0 +1 +2 +3\n" );
2468 for ( i = 0; i < 0x20; i+= 4 ) { 2468 for ( i = 0; i < 0x20; i+= 4 ) {
2469 printk( "TLAN: 0x%02x", i ); 2469 printk( "TLAN: 0x%02x", i );
2470 TLan_MiiReadReg( dev, phy, i, &data0 ); 2470 TLan_MiiReadReg( dev, phy, i, &data0 );
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
index 647cdd1d4e20..80333a4d3287 100644
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/tsi108_eth.c
@@ -263,7 +263,7 @@ static inline void tsi108_write_tbi(struct tsi108_prv_data *data,
263 return; 263 return;
264 udelay(10); 264 udelay(10);
265 } 265 }
266 printk(KERN_ERR "%s function time out \n", __func__); 266 printk(KERN_ERR "%s function time out\n", __func__);
267} 267}
268 268
269static int mii_speed(struct mii_if_info *mii) 269static int mii_speed(struct mii_if_info *mii)
@@ -1056,7 +1056,7 @@ static void tsi108_stop_ethernet(struct net_device *dev)
1056 return; 1056 return;
1057 udelay(10); 1057 udelay(10);
1058 } 1058 }
1059 printk(KERN_ERR "%s function time out \n", __func__); 1059 printk(KERN_ERR "%s function time out\n", __func__);
1060} 1060}
1061 1061
1062static void tsi108_reset_ether(struct tsi108_prv_data * data) 1062static void tsi108_reset_ether(struct tsi108_prv_data * data)
@@ -1233,7 +1233,7 @@ static void tsi108_init_phy(struct net_device *dev)
1233 udelay(10); 1233 udelay(10);
1234 } 1234 }
1235 if (i == 0) 1235 if (i == 0)
1236 printk(KERN_ERR "%s function time out \n", __func__); 1236 printk(KERN_ERR "%s function time out\n", __func__);
1237 1237
1238 if (data->phy_type == TSI108_PHY_BCM54XX) { 1238 if (data->phy_type == TSI108_PHY_BCM54XX) {
1239 tsi108_write_mii(data, 0x09, 0x0300); 1239 tsi108_write_mii(data, 0x09, 0x0300);
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 1b0aef37e495..75743a76bbe8 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3883,7 +3883,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
3883 } 3883 }
3884 3884
3885 if (netif_msg_probe(&debug)) 3885 if (netif_msg_probe(&debug))
3886 printk(KERN_INFO "ucc_geth: UCC%1d at 0x%8x (irq = %d) \n", 3886 printk(KERN_INFO "ucc_geth: UCC%1d at 0x%8x (irq = %d)\n",
3887 ug_info->uf_info.ucc_num + 1, ug_info->uf_info.regs, 3887 ug_info->uf_info.ucc_num + 1, ug_info->uf_info.regs,
3888 ug_info->uf_info.irq); 3888 ug_info->uf_info.irq);
3889 3889
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 46a7c9e689ec..0006837f535c 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -4174,7 +4174,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
4174 ret = pci_enable_sriov(pdev, max_config_dev - 1); 4174 ret = pci_enable_sriov(pdev, max_config_dev - 1);
4175 if (ret) 4175 if (ret)
4176 vxge_debug_ll_config(VXGE_ERR, 4176 vxge_debug_ll_config(VXGE_ERR,
4177 "Failed to enable SRIOV: %d \n", ret); 4177 "Failed to enable SRIOV: %d\n", ret);
4178 } 4178 }
4179 4179
4180 /* 4180 /*
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index f4f1c00d0d23..cb72cc7a1e86 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -395,7 +395,7 @@ static void tx1_dma_buf_check(pc300_t * card, int ch)
395 u16 next_bd = card->chan[ch].tx_next_bd; 395 u16 next_bd = card->chan[ch].tx_next_bd;
396 u32 scabase = card->hw.scabase; 396 u32 scabase = card->hw.scabase;
397 397
398 printk ("\nnfree_tx_bd = %d \n", card->chan[ch].nfree_tx_bd); 398 printk ("\nnfree_tx_bd = %d\n", card->chan[ch].nfree_tx_bd);
399 printk("#CH%d: f_bd = %d(0x%08x), n_bd = %d(0x%08x)\n", ch, 399 printk("#CH%d: f_bd = %d(0x%08x), n_bd = %d(0x%08x)\n", ch,
400 first_bd, TX_BD_ADDR(ch, first_bd), 400 first_bd, TX_BD_ADDR(ch, first_bd),
401 next_bd, TX_BD_ADDR(ch, next_bd)); 401 next_bd, TX_BD_ADDR(ch, next_bd));
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index 4917a94943bd..4293889e287e 100644
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -366,7 +366,7 @@ static void cpc_tty_close(struct tty_struct *tty, struct file *flip)
366 int res; 366 int res;
367 367
368 if (!tty || !tty->driver_data ) { 368 if (!tty || !tty->driver_data ) {
369 CPC_TTY_DBG("hdlx-tty: no TTY in close \n"); 369 CPC_TTY_DBG("hdlx-tty: no TTY in close\n");
370 return; 370 return;
371 } 371 }
372 372
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 31c41af2246d..43ae6f440bfb 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -1352,7 +1352,7 @@ static int sdla_set_config(struct net_device *dev, struct ifmap *map)
1352 return(-EINVAL); 1352 return(-EINVAL);
1353 1353
1354 if (!request_region(map->base_addr, SDLA_IO_EXTENTS, dev->name)){ 1354 if (!request_region(map->base_addr, SDLA_IO_EXTENTS, dev->name)){
1355 printk(KERN_WARNING "SDLA: io-port 0x%04lx in use \n", dev->base_addr); 1355 printk(KERN_WARNING "SDLA: io-port 0x%04lx in use\n", dev->base_addr);
1356 return(-EINVAL); 1356 return(-EINVAL);
1357 } 1357 }
1358 base = map->base_addr; 1358 base = map->base_addr;
diff --git a/drivers/net/wimax/i2400m/tx.c b/drivers/net/wimax/i2400m/tx.c
index 54480e8947f1..38f9c921f3e8 100644
--- a/drivers/net/wimax/i2400m/tx.c
+++ b/drivers/net/wimax/i2400m/tx.c
@@ -688,7 +688,7 @@ try_new:
688 pl_type, buf_len); 688 pl_type, buf_len);
689 tx_msg->num_pls = le16_to_cpu(num_pls+1); 689 tx_msg->num_pls = le16_to_cpu(num_pls+1);
690 tx_msg->size += padded_len; 690 tx_msg->size += padded_len;
691 d_printf(2, dev, "TX: appended %zu b (up to %u b) pl #%u \n", 691 d_printf(2, dev, "TX: appended %zu b (up to %u b) pl #%u\n",
692 padded_len, tx_msg->size, num_pls+1); 692 padded_len, tx_msg->size, num_pls+1);
693 d_printf(2, dev, 693 d_printf(2, dev,
694 "TX: appended hdr @%zu %zu b pl #%u @%zu %zu/%zu b\n", 694 "TX: appended hdr @%zu %zu b pl #%u @%zu %zu/%zu b\n",
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-25 06:21:48 -0500