diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-11 18:58:07 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-11 19:53:55 -0500 |
| commit | 1a3b50566f259eb79039b720dbfdbb97a7a1b9c5 (patch) | |
| tree | 1fe4ee8e54fdbd561cf1f9836ed27c5a389b1359 | |
| parent | df7841604394c57289072d15fcd90a2585b701a6 (diff) | |
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>
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index c8a54f96cf5d..915eca910569 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c | |||
| @@ -582,7 +582,7 @@ static void cpsw_intr_disable(struct cpsw_priv *priv) | |||
| 582 | return; | 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 | struct sk_buff *skb = token; | 587 | struct sk_buff *skb = token; |
| 588 | struct net_device *ndev = skb->dev; | 588 | struct net_device *ndev = skb->dev; |
| @@ -599,7 +599,7 @@ void cpsw_tx_handler(void *token, int len, int status) | |||
| 599 | dev_kfree_skb_any(skb); | 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 | struct sk_buff *skb = token; | 604 | struct sk_buff *skb = token; |
| 605 | struct sk_buff *new_skb; | 605 | struct sk_buff *new_skb; |
| @@ -2142,8 +2142,8 @@ static int cpsw_probe(struct platform_device *pdev) | |||
| 2142 | data->cpts_clock_mult, data->cpts_clock_shift)) | 2142 | data->cpts_clock_mult, data->cpts_clock_shift)) |
| 2143 | dev_err(priv->dev, "error registering cpts device\n"); | 2143 | dev_err(priv->dev, "error registering cpts device\n"); |
| 2144 | 2144 | ||
| 2145 | cpsw_notice(priv, probe, "initialized device (regs %x, irq %d)\n", | 2145 | cpsw_notice(priv, probe, "initialized device (regs %pa, irq %d)\n", |
| 2146 | ss_res->start, ndev->irq); | 2146 | &ss_res->start, ndev->irq); |
| 2147 | 2147 | ||
| 2148 | if (priv->data.dual_emac) { | 2148 | if (priv->data.dual_emac) { |
| 2149 | ret = cpsw_probe_dual_emac(pdev, priv); | 2149 | ret = cpsw_probe_dual_emac(pdev, priv); |
