Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aef614e1 authored by Sebastian Siewior's avatar Sebastian Siewior Committed by David S. Miller
Browse files

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: default avatarMugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fd51cf19

drivers/net/ethernet/ti/cpsw.c

+5 −5
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ void cpsw_rx_handler(void *token, int len, int status) 
			return;



		ret = cpdma_chan_submit(priv->rxch, skb, skb->data,

					skb_tailroom(skb), 0, GFP_KERNEL);

					skb_tailroom(skb), 0);

	}

	WARN_ON(ret < 0);

}
@@ -747,14 +747,14 @@ static inline int cpsw_tx_packet_submit(struct net_device *ndev, 
{

	if (!priv->data.dual_emac)

		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))

		return cpdma_chan_submit(priv->txch, skb, skb->data,

				  skb->len, 1, GFP_KERNEL);

				  skb->len, 1);

	else

		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(
@@ -937,7 +937,7 @@ static int cpsw_ndo_open(struct net_device *ndev) 
			if (!skb)

				goto err_cleanup;

			ret = cpdma_chan_submit(priv->rxch, skb, skb->data,

					skb_tailroom(skb), 0, GFP_KERNEL);

					skb_tailroom(skb), 0);

			if (ret < 0) {

				kfree_skb(skb);

				goto err_cleanup;

drivers/net/ethernet/ti/davinci_cpdma.c

+1 −1
Original line number Diff line number Diff line
@@ -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 len, int directed, gfp_t gfp_mask)

		      int len, int directed)

{

	struct cpdma_ctlr		*ctlr = chan->ctlr;

	struct cpdma_desc __iomem	*desc;

drivers/net/ethernet/ti/davinci_cpdma.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ int cpdma_chan_dump(struct cpdma_chan *chan); 
int cpdma_chan_get_stats(struct cpdma_chan *chan,

			 struct cpdma_chan_stats *stats);

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_ctlr_int_ctrl(struct cpdma_ctlr *ctlr, bool enable);

drivers/net/ethernet/ti/davinci_emac.c

+3 −3
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ static void emac_rx_handler(void *token, int len, int status) 


recycle:

	ret = cpdma_chan_submit(priv->rxchan, skb, skb->data,

			skb_tailroom(skb), 0, GFP_KERNEL);

			skb_tailroom(skb), 0);



	WARN_ON(ret == -ENOMEM);

	if (unlikely(ret < 0))
@@ -1092,7 +1092,7 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) 
	skb_tx_timestamp(skb);



	ret_code = cpdma_chan_submit(priv->txchan, skb, skb->data, skb->len,

				     0, GFP_KERNEL);

				     0);

	if (unlikely(ret_code != 0)) {

		if (netif_msg_tx_err(priv) && net_ratelimit())

			dev_err(emac_dev, "DaVinci EMAC: desc submit failed");
@@ -1558,7 +1558,7 @@ static int emac_dev_open(struct net_device *ndev) 
			break;



		ret = cpdma_chan_submit(priv->rxchan, skb, skb->data,

					skb_tailroom(skb), 0, GFP_KERNEL);

					skb_tailroom(skb), 0);

		if (WARN_ON(ret < 0))

			break;

	}