aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Siewior <bigeasy@linutronix.de>2013-04-23 03:31:38 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-25 04:11:50 -0400
commitaef614e13dfbdd3b9ae44ad110159f75b9029bba (patch)
tree84ddddd07f5591e98d1b269910dc87efa5117556
parentfd51cf199421197d14099b4ba382301cc28e5544 (diff)
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: Mugunthan V N <mugunthanvnm@ti.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/ti/cpsw.c10
-rw-r--r--drivers/net/ethernet/ti/davinci_cpdma.c2
-rw-r--r--drivers/net/ethernet/ti/davinci_cpdma.h2
-rw-r--r--drivers/net/ethernet/ti/davinci_emac.c6
4 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index ff0d528204ab..05f11b854d0a 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -502,7 +502,7 @@ void cpsw_rx_handler(void *token, int len, int status)
502 return; 502 return;
503 503
504 ret = cpdma_chan_submit(priv->rxch, skb, skb->data, 504 ret = cpdma_chan_submit(priv->rxch, skb, skb->data,
505 skb_tailroom(skb), 0, GFP_KERNEL); 505 skb_tailroom(skb), 0);
506 } 506 }
507 WARN_ON(ret < 0); 507 WARN_ON(ret < 0);
508} 508}
@@ -747,14 +747,14 @@ static inline int cpsw_tx_packet_submit(struct net_device *ndev,
747{ 747{
748 if (!priv->data.dual_emac) 748 if (!priv->data.dual_emac)
749 return cpdma_chan_submit(priv->txch, skb, skb->data, 749 return cpdma_chan_submit(priv->txch, skb, skb->data,
750 skb->len, 0, GFP_KERNEL); 750 skb->len, 0);
751 751
752 if (ndev == cpsw_get_slave_ndev(priv, 0)) 752 if (ndev == cpsw_get_slave_ndev(priv, 0))
753 return cpdma_chan_submit(priv->txch, skb, skb->data, 753 return cpdma_chan_submit(priv->txch, skb, skb->data,
754 skb->len, 1, GFP_KERNEL); 754 skb->len, 1);
755 else 755 else
756 return cpdma_chan_submit(priv->txch, skb, skb->data, 756 return cpdma_chan_submit(priv->txch, skb, skb->data,
757 skb->len, 2, GFP_KERNEL); 757 skb->len, 2);
758} 758}
759 759
760static inline void cpsw_add_dual_emac_def_ale_entries( 760static inline void cpsw_add_dual_emac_def_ale_entries(
@@ -937,7 +937,7 @@ static int cpsw_ndo_open(struct net_device *ndev)
937 if (!skb) 937 if (!skb)
938 goto err_cleanup; 938 goto err_cleanup;
939 ret = cpdma_chan_submit(priv->rxch, skb, skb->data, 939 ret = cpdma_chan_submit(priv->rxch, skb, skb->data,
940 skb_tailroom(skb), 0, GFP_KERNEL); 940 skb_tailroom(skb), 0);
941 if (ret < 0) { 941 if (ret < 0) {
942 kfree_skb(skb); 942 kfree_skb(skb);
943 goto err_cleanup; 943 goto err_cleanup;
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index 3e34187997de..3cc20e7da01b 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -676,7 +676,7 @@ static void __cpdma_chan_submit(struct cpdma_chan *chan,
676} 676}
677 677
678int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data, 678int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data,
679 int len, int directed, gfp_t gfp_mask) 679 int len, int directed)
680{ 680{
681 struct cpdma_ctlr *ctlr = chan->ctlr; 681 struct cpdma_ctlr *ctlr = chan->ctlr;
682 struct cpdma_desc __iomem *desc; 682 struct cpdma_desc __iomem *desc;
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.h b/drivers/net/ethernet/ti/davinci_cpdma.h
index d9bcc6032fdc..86dee487f2f0 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.h
+++ b/drivers/net/ethernet/ti/davinci_cpdma.h
@@ -89,7 +89,7 @@ int cpdma_chan_dump(struct cpdma_chan *chan);
89int cpdma_chan_get_stats(struct cpdma_chan *chan, 89int cpdma_chan_get_stats(struct cpdma_chan *chan,
90 struct cpdma_chan_stats *stats); 90 struct cpdma_chan_stats *stats);
91int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data, 91int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data,
92 int len, int directed, gfp_t gfp_mask); 92 int len, int directed);
93int cpdma_chan_process(struct cpdma_chan *chan, int quota); 93int cpdma_chan_process(struct cpdma_chan *chan, int quota);
94 94
95int cpdma_ctlr_int_ctrl(struct cpdma_ctlr *ctlr, bool enable); 95int cpdma_ctlr_int_ctrl(struct cpdma_ctlr *ctlr, bool enable);
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 6a0b47715a84..860e15ddfbcb 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1037,7 +1037,7 @@ static void emac_rx_handler(void *token, int len, int status)
1037 1037
1038recycle: 1038recycle:
1039 ret = cpdma_chan_submit(priv->rxchan, skb, skb->data, 1039 ret = cpdma_chan_submit(priv->rxchan, skb, skb->data,
1040 skb_tailroom(skb), 0, GFP_KERNEL); 1040 skb_tailroom(skb), 0);
1041 1041
1042 WARN_ON(ret == -ENOMEM); 1042 WARN_ON(ret == -ENOMEM);
1043 if (unlikely(ret < 0)) 1043 if (unlikely(ret < 0))
@@ -1092,7 +1092,7 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)
1092 skb_tx_timestamp(skb); 1092 skb_tx_timestamp(skb);
1093 1093
1094 ret_code = cpdma_chan_submit(priv->txchan, skb, skb->data, skb->len, 1094 ret_code = cpdma_chan_submit(priv->txchan, skb, skb->data, skb->len,
1095 0, GFP_KERNEL); 1095 0);
1096 if (unlikely(ret_code != 0)) { 1096 if (unlikely(ret_code != 0)) {
1097 if (netif_msg_tx_err(priv) && net_ratelimit()) 1097 if (netif_msg_tx_err(priv) && net_ratelimit())
1098 dev_err(emac_dev, "DaVinci EMAC: desc submit failed"); 1098 dev_err(emac_dev, "DaVinci EMAC: desc submit failed");
@@ -1558,7 +1558,7 @@ static int emac_dev_open(struct net_device *ndev)
1558 break; 1558 break;
1559 1559
1560 ret = cpdma_chan_submit(priv->rxchan, skb, skb->data, 1560 ret = cpdma_chan_submit(priv->rxchan, skb, skb->data,
1561 skb_tailroom(skb), 0, GFP_KERNEL); 1561 skb_tailroom(skb), 0);
1562 if (WARN_ON(ret < 0)) 1562 if (WARN_ON(ret < 0))
1563 break; 1563 break;
1564 } 1564 }