aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/davinci_emac.c
diff options
context:
space:
mode:
authorChaithrika U S <chaithrika@ti.com>2009-06-04 00:54:29 -0400
committerDavid S. Miller <davem@davemloft.net>2009-06-04 00:54:29 -0400
commit5c726166692449dfd570bf4497d427f1ea200ad3 (patch)
tree09ee51b41131c45eb0220c4b37d764627d517753 /drivers/net/davinci_emac.c
parentc722c625dbe2758d53365c0ed7d401b0e286f2cf (diff)
TI DaVinci EMAC: Remove print_mac, DECLARE_MAC_BUF
Use printk format specifier for MAC address. Remove DECALRE_MAC_BUF and print_mac() usage in the driver. Signed-off-by: Chaithrika U S <chaithrika@ti.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/davinci_emac.c')
-rw-r--r--drivers/net/davinci_emac.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index cf689a056b38..0e9b9f9632c1 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -1819,7 +1819,6 @@ static int emac_dev_setmac_addr(struct net_device *ndev, void *addr)
1819 struct emac_rxch *rxch = priv->rxch[EMAC_DEF_RX_CH]; 1819 struct emac_rxch *rxch = priv->rxch[EMAC_DEF_RX_CH];
1820 struct device *emac_dev = &priv->ndev->dev; 1820 struct device *emac_dev = &priv->ndev->dev;
1821 struct sockaddr *sa = addr; 1821 struct sockaddr *sa = addr;
1822 DECLARE_MAC_BUF(mac);
1823 1822
1824 /* Store mac addr in priv and rx channel and set it in EMAC hw */ 1823 /* Store mac addr in priv and rx channel and set it in EMAC hw */
1825 memcpy(priv->mac_addr, sa->sa_data, ndev->addr_len); 1824 memcpy(priv->mac_addr, sa->sa_data, ndev->addr_len);
@@ -1828,8 +1827,8 @@ static int emac_dev_setmac_addr(struct net_device *ndev, void *addr)
1828 emac_setmac(priv, EMAC_DEF_RX_CH, rxch->mac_addr); 1827 emac_setmac(priv, EMAC_DEF_RX_CH, rxch->mac_addr);
1829 1828
1830 if (netif_msg_drv(priv)) 1829 if (netif_msg_drv(priv))
1831 dev_notice(emac_dev, "DaVinci EMAC: emac_dev_setmac_addr %s\n", 1830 dev_notice(emac_dev, "DaVinci EMAC: emac_dev_setmac_addr %pM\n",
1832 print_mac(mac, priv->mac_addr)); 1831 priv->mac_addr);
1833 1832
1834 return 0; 1833 return 0;
1835} 1834}
@@ -2683,11 +2682,10 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
2683 ndev->irq = res->start; 2682 ndev->irq = res->start;
2684 2683
2685 if (!is_valid_ether_addr(priv->mac_addr)) { 2684 if (!is_valid_ether_addr(priv->mac_addr)) {
2686 DECLARE_MAC_BUF(buf);
2687 /* Use random MAC if none passed */ 2685 /* Use random MAC if none passed */
2688 random_ether_addr(priv->mac_addr); 2686 random_ether_addr(priv->mac_addr);
2689 printk(KERN_WARNING "%s: using random MAC addr: %s\n", 2687 printk(KERN_WARNING "%s: using random MAC addr: %pM\n",
2690 __func__, print_mac(buf, priv->mac_addr)); 2688 __func__, priv->mac_addr);
2691 } 2689 }
2692 2690
2693 ndev->netdev_ops = &emac_netdev_ops; 2691 ndev->netdev_ops = &emac_netdev_ops;