* [PATCH] net: eth: cpsw: 64-bit phys_addr_t and sparse cleanup
@ 2013-12-11 23:58 Olof Johansson
2013-12-12 0:54 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Olof Johansson @ 2013-12-11 23:58 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-kernel, linux-omap, Olof Johansson
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>
---
Missed this one with the previous 64-bit phys_addr_t fix. Feel free to
fold it in, or apply separately.
-Olof
drivers/net/ethernet/ti/cpsw.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index c8a54f9..915eca9 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)
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);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: eth: cpsw: 64-bit phys_addr_t and sparse cleanup
2013-12-11 23:58 [PATCH] net: eth: cpsw: 64-bit phys_addr_t and sparse cleanup Olof Johansson
@ 2013-12-12 0:54 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-12-12 0:54 UTC (permalink / raw)
To: olof; +Cc: netdev, linux-kernel, linux-omap
From: Olof Johansson <olof@lixom.net>
Date: Wed, 11 Dec 2013 15:58:07 -0800
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-12 0:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-11 23:58 [PATCH] net: eth: cpsw: 64-bit phys_addr_t and sparse cleanup Olof Johansson
2013-12-12 0:54 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.