Skip to content

Commit

Permalink
net: ethernet: ti: cpsw: update cpsw_split_res() to accept cpsw_common
Browse files Browse the repository at this point in the history
Update cpsw_split_res() to accept struct cpsw_common instead of
struct net_device to simplify code.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Grygorii Strashko authored and David S. Miller committed Apr 27, 2019
1 parent 16f5416 commit 9763a89
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions drivers/net/ethernet/ti/cpsw.c
Original file line number Diff line number Diff line change
Expand Up @@ -963,11 +963,9 @@ static void cpsw_rx_handler(void *token, int len, int status)
dev_kfree_skb_any(new_skb);
}

static void cpsw_split_res(struct net_device *ndev)
static void cpsw_split_res(struct cpsw_common *cpsw)
{
struct cpsw_priv *priv = netdev_priv(ndev);
u32 consumed_rate = 0, bigest_rate = 0;
struct cpsw_common *cpsw = priv->cpsw;
struct cpsw_vector *txv = cpsw->txv;
int i, ch_weight, rlim_ch_num = 0;
int budget, bigest_rate_ch = 0;
Expand Down Expand Up @@ -1341,7 +1339,7 @@ static void cpsw_adjust_link(struct net_device *ndev)

if (link) {
if (cpsw_need_resplit(cpsw))
cpsw_split_res(ndev);
cpsw_split_res(cpsw);

netif_carrier_on(ndev);
if (netif_running(ndev))
Expand Down Expand Up @@ -2107,7 +2105,7 @@ static int cpsw_ndo_stop(struct net_device *ndev)
for_each_slave(priv, cpsw_slave_stop, cpsw);

if (cpsw_need_resplit(cpsw))
cpsw_split_res(ndev);
cpsw_split_res(cpsw);

cpsw->usage_count--;
pm_runtime_put_sync(cpsw->dev);
Expand Down Expand Up @@ -2594,7 +2592,7 @@ static int cpsw_ndo_set_tx_maxrate(struct net_device *ndev, int queue, u32 rate)
netdev_get_tx_queue(slave->ndev, queue)->tx_maxrate = rate;
}

cpsw_split_res(ndev);
cpsw_split_res(cpsw);
return ret;
}

Expand Down Expand Up @@ -3063,7 +3061,7 @@ static int cpsw_set_channels(struct net_device *ndev,
}

if (cpsw->usage_count)
cpsw_split_res(ndev);
cpsw_split_res(cpsw);

ret = cpsw_resume_data_pass(ndev);
if (!ret)
Expand Down Expand Up @@ -3698,7 +3696,7 @@ static int cpsw_probe(struct platform_device *pdev)
netif_tx_napi_add(ndev, &cpsw->napi_tx,
cpsw->quirk_irq ? cpsw_tx_poll : cpsw_tx_mq_poll,
CPSW_POLL_WEIGHT);
cpsw_split_res(ndev);
cpsw_split_res(cpsw);

/* register the network device */
SET_NETDEV_DEV(ndev, &pdev->dev);
Expand Down

0 comments on commit 9763a89

Please sign in to comment.