aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/smsc/smsc911x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/smsc/smsc911x.c')
-rw-r--r--drivers/net/ethernet/smsc/smsc911x.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 6382b7c416f4..a0fc151da40d 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -439,7 +439,8 @@ static int smsc911x_request_resources(struct platform_device *pdev)
439 /* Request clock */ 439 /* Request clock */
440 pdata->clk = clk_get(&pdev->dev, NULL); 440 pdata->clk = clk_get(&pdev->dev, NULL);
441 if (IS_ERR(pdata->clk)) 441 if (IS_ERR(pdata->clk))
442 netdev_warn(ndev, "couldn't get clock %li\n", PTR_ERR(pdata->clk)); 442 dev_dbg(&pdev->dev, "couldn't get clock %li\n",
443 PTR_ERR(pdata->clk));
443 444
444 return ret; 445 return ret;
445} 446}
@@ -1672,7 +1673,7 @@ static int smsc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
1672 pdata->ops->tx_writefifo(pdata, (unsigned int *)bufp, wrsz); 1673 pdata->ops->tx_writefifo(pdata, (unsigned int *)bufp, wrsz);
1673 freespace -= (skb->len + 32); 1674 freespace -= (skb->len + 32);
1674 skb_tx_timestamp(skb); 1675 skb_tx_timestamp(skb);
1675 dev_kfree_skb(skb); 1676 dev_consume_skb_any(skb);
1676 1677
1677 if (unlikely(smsc911x_tx_get_txstatcount(pdata) >= 30)) 1678 if (unlikely(smsc911x_tx_get_txstatcount(pdata) >= 30))
1678 smsc911x_tx_update_txcounters(dev); 1679 smsc911x_tx_update_txcounters(dev);
@@ -2379,8 +2380,6 @@ static int smsc911x_drv_probe(struct platform_device *pdev)
2379 int res_size, irq_flags; 2380 int res_size, irq_flags;
2380 int retval; 2381 int retval;
2381 2382
2382 pr_info("Driver version %s\n", SMSC_DRV_VERSION);
2383
2384 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, 2383 res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
2385 "smsc911x-memory"); 2384 "smsc911x-memory");
2386 if (!res) 2385 if (!res)