Skip to content

Commit

Permalink
net: eth: cpsw: 64-bit phys_addr_t and sparse cleanup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Olof Johansson authored and David S. Miller committed Dec 12, 2013
1 parent df78416 commit 1a3b505
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/net/ethernet/ti/cpsw.c
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ static void cpsw_intr_disable(struct cpsw_priv *priv)
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 net_device *ndev = skb->dev;
Expand All @@ -599,7 +599,7 @@ void cpsw_tx_handler(void *token, int len, int status)
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 *new_skb;
Expand Down Expand Up @@ -2142,8 +2142,8 @@ static int cpsw_probe(struct platform_device *pdev)
data->cpts_clock_mult, data->cpts_clock_shift))
dev_err(priv->dev, "error registering cpts device\n");

cpsw_notice(priv, probe, "initialized device (regs %x, irq %d)\n",
ss_res->start, ndev->irq);
cpsw_notice(priv, probe, "initialized device (regs %pa, irq %d)\n",
&ss_res->start, ndev->irq);

if (priv->data.dual_emac) {
ret = cpsw_probe_dual_emac(pdev, priv);
Expand Down

0 comments on commit 1a3b505

Please sign in to comment.