openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: eth: cpsw: 64-bit phys_addr_t and sparse cleanup 

Minor fix for printk format of a phys_addr_t, and the switch of two local
functions to static since they're not used outside of the file.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Olof Johansson 2013-12-11 15:58:07 -08:00 committed by David S. Miller
parent df78416043
commit 1a3b50566f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/ti/cpsw.c
View File

@ -582,7 +582,7 @@ static void cpsw_intr_disable(struct cpsw_priv *priv)
return; return;
} }
void cpsw_tx_handler(void *token, int len, int status) static void cpsw_tx_handler(void *token, int len, int status)
{ {
struct sk_buff *skb = token; struct sk_buff *skb = token;
struct net_device *ndev = skb->dev; struct net_device *ndev = skb->dev;
@ -599,7 +599,7 @@ void cpsw_tx_handler(void *token, int len, int status)
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
} }
void cpsw_rx_handler(void *token, int len, int status) static void cpsw_rx_handler(void *token, int len, int status)
{ {
struct sk_buff *skb = token; struct sk_buff *skb = token;
struct sk_buff *new_skb; struct sk_buff *new_skb;
@ -2142,8 +2142,8 @@ static int cpsw_probe(struct platform_device *pdev)
data->cpts_clock_mult, data->cpts_clock_shift)) data->cpts_clock_mult, data->cpts_clock_shift))
dev_err(priv->dev, "error registering cpts device\n"); dev_err(priv->dev, "error registering cpts device\n");
cpsw_notice(priv, probe, "initialized device (regs %x, irq %d)\n", cpsw_notice(priv, probe, "initialized device (regs %pa, irq %d)\n",
ss_res->start, ndev->irq); &ss_res->start, ndev->irq);
if (priv->data.dual_emac) { if (priv->data.dual_emac) {
ret = cpsw_probe_dual_emac(pdev, priv); ret = cpsw_probe_dual_emac(pdev, priv);