Re: [PATCH v2 net-next 4/7] net: ethernet: ti: cpsw_ethtool: simplify slave loops

[grygorii]

On 30/05/2019 21:20, Ivan Khoronzhuk wrote:
> Only for consistency reasons, do it like in main cpsw.c module
> and use ndev reference but not by means of slave.
>
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@xxxxxxxxxx>
> ---
>   drivers/net/ethernet/ti/cpsw_ethtool.c | 40 ++++++++++++++------------
>   1 file changed, 21 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/net/ethernet/ti/cpsw_ethtool.c b/drivers/net/ethernet/ti/cpsw_ethtool.c
> index a4a7ec0d2531..c260bb32aacf 100644
> --- a/drivers/net/ethernet/ti/cpsw_ethtool.c
> +++ b/drivers/net/ethernet/ti/cpsw_ethtool.c
> @@ -458,7 +458,6 @@ int cpsw_nway_reset(struct net_device *ndev)
>   static void cpsw_suspend_data_pass(struct net_device *ndev)
>   {

[...]

>   
>   	return 0;
>   }
> @@ -587,7 +590,6 @@ int cpsw_set_channels_common(struct net_device *ndev,
>   {
>   	struct cpsw_priv *priv = netdev_priv(ndev);
>   	struct cpsw_common *cpsw = priv->cpsw;
> -	struct cpsw_slave *slave;
>   	int i, ret;
>   
>   	ret = cpsw_check_ch_settings(cpsw, chs);
> @@ -604,20 +606,20 @@ int cpsw_set_channels_common(struct net_device *ndev,
>   	if (ret)
>   		goto err;
>   
> -	for (i = cpsw->data.slaves, slave = cpsw->slaves; i; i--, slave++) {
> -		if (!(slave->ndev && netif_running(slave->ndev)))
> +	for (i = 0; i < cpsw->data.slaves; i++) {
> +		struct net_device *ndev = cpsw->slaves[i].ndev;

Sry, but could you rename this local var "ndev" and make it differ from func argument name.

> +
> +		if (!(ndev && netif_running(ndev)))
>   			continue;
>   
>   		/* Inform stack about new count of queues */
> -		ret = netif_set_real_num_tx_queues(slave->ndev,
> -						   cpsw->tx_ch_num);
> +		ret = netif_set_real_num_tx_queues(ndev, cpsw->tx_ch_num);
>   		if (ret) {
>   			dev_err(priv->dev, "cannot set real number of tx queues\n");
>   			goto err;
>   		}
>   
> -		ret = netif_set_real_num_rx_queues(slave->ndev,
> -						   cpsw->rx_ch_num);
> +		ret = netif_set_real_num_rx_queues(ndev, cpsw->rx_ch_num);
>   		if (ret) {
>   			dev_err(priv->dev, "cannot set real number of rx queues\n");
>   			goto err;

--
Best regards,
grygorii