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

olofj · davem330 · commit 1a3b50566f25 · 2013-12-11T19:53:55.000-05:00
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 &lt;olof@lixom.net&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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)
 	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;
@@ -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;
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,7 @@ static void cpsw_intr_disable(struct cpsw_priv *priv)`
`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 @@ void cpsw_tx_handler(void *token, int len, int status)`
`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 @@ static int cpsw_probe(struct platform_device *pdev)`
`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);`