提交 aef614e1 编写于 作者: S Sebastian Siewior 提交者: David S. Miller

net/davinci_cpdma: remove unused argument in cpdma_chan_submit()

The gfp_mask argument is not used in cpdma_chan_submit() and always set
to GFP_KERNEL even in atomic sections. This patch drops it since it is
unused.
Acked-by: NMugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: NSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 fd51cf19
...@@ -502,7 +502,7 @@ void cpsw_rx_handler(void *token, int len, int status) ...@@ -502,7 +502,7 @@ void cpsw_rx_handler(void *token, int len, int status)
return; return;
ret = cpdma_chan_submit(priv->rxch, skb, skb->data, ret = cpdma_chan_submit(priv->rxch, skb, skb->data,
skb_tailroom(skb), 0, GFP_KERNEL); skb_tailroom(skb), 0);
} }
WARN_ON(ret < 0); WARN_ON(ret < 0);
} }
...@@ -747,14 +747,14 @@ static inline int cpsw_tx_packet_submit(struct net_device *ndev, ...@@ -747,14 +747,14 @@ static inline int cpsw_tx_packet_submit(struct net_device *ndev,
{ {
if (!priv->data.dual_emac) if (!priv->data.dual_emac)
return cpdma_chan_submit(priv->txch, skb, skb->data, return cpdma_chan_submit(priv->txch, skb, skb->data,
skb->len, 0, GFP_KERNEL); skb->len, 0);
if (ndev == cpsw_get_slave_ndev(priv, 0)) if (ndev == cpsw_get_slave_ndev(priv, 0))
return cpdma_chan_submit(priv->txch, skb, skb->data, return cpdma_chan_submit(priv->txch, skb, skb->data,
skb->len, 1, GFP_KERNEL); skb->len, 1);
else else
return cpdma_chan_submit(priv->txch, skb, skb->data, return cpdma_chan_submit(priv->txch, skb, skb->data,
skb->len, 2, GFP_KERNEL); skb->len, 2);
} }
static inline void cpsw_add_dual_emac_def_ale_entries( static inline void cpsw_add_dual_emac_def_ale_entries(
...@@ -937,7 +937,7 @@ static int cpsw_ndo_open(struct net_device *ndev) ...@@ -937,7 +937,7 @@ static int cpsw_ndo_open(struct net_device *ndev)
if (!skb) if (!skb)
goto err_cleanup; goto err_cleanup;
ret = cpdma_chan_submit(priv->rxch, skb, skb->data, ret = cpdma_chan_submit(priv->rxch, skb, skb->data,
skb_tailroom(skb), 0, GFP_KERNEL); skb_tailroom(skb), 0);
if (ret < 0) { if (ret < 0) {
kfree_skb(skb); kfree_skb(skb);
goto err_cleanup; goto err_cleanup;
......
...@@ -676,7 +676,7 @@ static void __cpdma_chan_submit(struct cpdma_chan *chan, ...@@ -676,7 +676,7 @@ static void __cpdma_chan_submit(struct cpdma_chan *chan,
} }
int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data, int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data,
int len, int directed, gfp_t gfp_mask) int len, int directed)
{ {
struct cpdma_ctlr *ctlr = chan->ctlr; struct cpdma_ctlr *ctlr = chan->ctlr;
struct cpdma_desc __iomem *desc; struct cpdma_desc __iomem *desc;
......
...@@ -89,7 +89,7 @@ int cpdma_chan_dump(struct cpdma_chan *chan); ...@@ -89,7 +89,7 @@ int cpdma_chan_dump(struct cpdma_chan *chan);
int cpdma_chan_get_stats(struct cpdma_chan *chan, int cpdma_chan_get_stats(struct cpdma_chan *chan,
struct cpdma_chan_stats *stats); struct cpdma_chan_stats *stats);
int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data, int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data,
int len, int directed, gfp_t gfp_mask); int len, int directed);
int cpdma_chan_process(struct cpdma_chan *chan, int quota); int cpdma_chan_process(struct cpdma_chan *chan, int quota);
int cpdma_ctlr_int_ctrl(struct cpdma_ctlr *ctlr, bool enable); int cpdma_ctlr_int_ctrl(struct cpdma_ctlr *ctlr, bool enable);
......
...@@ -1037,7 +1037,7 @@ static void emac_rx_handler(void *token, int len, int status) ...@@ -1037,7 +1037,7 @@ static void emac_rx_handler(void *token, int len, int status)
recycle: recycle:
ret = cpdma_chan_submit(priv->rxchan, skb, skb->data, ret = cpdma_chan_submit(priv->rxchan, skb, skb->data,
skb_tailroom(skb), 0, GFP_KERNEL); skb_tailroom(skb), 0);
WARN_ON(ret == -ENOMEM); WARN_ON(ret == -ENOMEM);
if (unlikely(ret < 0)) if (unlikely(ret < 0))
...@@ -1092,7 +1092,7 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) ...@@ -1092,7 +1092,7 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)
skb_tx_timestamp(skb); skb_tx_timestamp(skb);
ret_code = cpdma_chan_submit(priv->txchan, skb, skb->data, skb->len, ret_code = cpdma_chan_submit(priv->txchan, skb, skb->data, skb->len,
0, GFP_KERNEL); 0);
if (unlikely(ret_code != 0)) { if (unlikely(ret_code != 0)) {
if (netif_msg_tx_err(priv) && net_ratelimit()) if (netif_msg_tx_err(priv) && net_ratelimit())
dev_err(emac_dev, "DaVinci EMAC: desc submit failed"); dev_err(emac_dev, "DaVinci EMAC: desc submit failed");
...@@ -1558,7 +1558,7 @@ static int emac_dev_open(struct net_device *ndev) ...@@ -1558,7 +1558,7 @@ static int emac_dev_open(struct net_device *ndev)
break; break;
ret = cpdma_chan_submit(priv->rxchan, skb, skb->data, ret = cpdma_chan_submit(priv->rxchan, skb, skb->data,
skb_tailroom(skb), 0, GFP_KERNEL); skb_tailroom(skb), 0);
if (WARN_ON(ret < 0)) if (WARN_ON(ret < 0))
break; break;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册