Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1a3b50566f259eb79039b720dbfdbb97a7a1b9c5

Authored by Olof Johansson
Committed by David S. Miller
1 parent df78416043
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

drivers/net/ethernet/ti/cpsw.c
Diff comments   View file @ 1a3b505
... ... @@ -582,7 +582,7 @@
582 582 return;
583 583 }
584 584  
585   -void cpsw_tx_handler(void *token, int len, int status)
  585 +static void cpsw_tx_handler(void *token, int len, int status)
586 586 {
587 587 struct sk_buff *skb = token;
588 588 struct net_device *ndev = skb->dev;
... ... @@ -599,7 +599,7 @@
599 599 dev_kfree_skb_any(skb);
600 600 }
601 601  
602   -void cpsw_rx_handler(void *token, int len, int status)
  602 +static void cpsw_rx_handler(void *token, int len, int status)
603 603 {
604 604 struct sk_buff *skb = token;
605 605 struct sk_buff *new_skb;
... ... @@ -2142,8 +2142,8 @@
2142 2142 data->cpts_clock_mult, data->cpts_clock_shift))
2143 2143 dev_err(priv->dev, "error registering cpts device\n");
2144 2144  
2145   - cpsw_notice(priv, probe, "initialized device (regs %x, irq %d)\n",
2146   - ss_res->start, ndev->irq);
  2145 + cpsw_notice(priv, probe, "initialized device (regs %pa, irq %d)\n",
  2146 + &ss_res->start, ndev->irq);
2147 2147  
2148 2148 if (priv->data.dual_emac) {
2149 2149 ret = cpsw_probe_dual_emac(pdev, priv);