Commit 0d5775d3 authored by Catherine Sullivan's avatar Catherine Sullivan Committed by David S. Miller
Browse files

gve: Use dev_info/err instead of netif_info/err. 



Update the driver to use dev_info/err instead of netif_info/err.

Reviewed-by: default avatarYangchun Fu <yangchun@google.com>
Signed-off-by: default avatarCatherine Sullivan <csully@google.com>
Signed-off-by: default avatarDavid Awogbemila <awogbemila@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 433e274b

drivers/net/ethernet/google/gve/gve_adminq.c

+6 −9
Original line number Diff line number Diff line
@@ -334,8 +334,7 @@ int gve_adminq_describe_device(struct gve_priv *priv) 


	priv->tx_desc_cnt = be16_to_cpu(descriptor->tx_queue_entries);

	if (priv->tx_desc_cnt * sizeof(priv->tx->desc[0]) < PAGE_SIZE) {

		netif_err(priv, drv, priv->dev, "Tx desc count %d too low\n",

			  priv->tx_desc_cnt);

		dev_err(&priv->pdev->dev, "Tx desc count %d too low\n", priv->tx_desc_cnt);

		err = -EINVAL;

		goto free_device_descriptor;

	}
@@ -344,8 +343,7 @@ int gve_adminq_describe_device(struct gve_priv *priv) 
	    < PAGE_SIZE ||

	    priv->rx_desc_cnt * sizeof(priv->rx->data.data_ring[0])

	    < PAGE_SIZE) {

		netif_err(priv, drv, priv->dev, "Rx desc count %d too low\n",

			  priv->rx_desc_cnt);

		dev_err(&priv->pdev->dev, "Rx desc count %d too low\n", priv->rx_desc_cnt);

		err = -EINVAL;

		goto free_device_descriptor;

	}
@@ -353,8 +351,7 @@ int gve_adminq_describe_device(struct gve_priv *priv) 
				be64_to_cpu(descriptor->max_registered_pages);

	mtu = be16_to_cpu(descriptor->mtu);

	if (mtu < ETH_MIN_MTU) {

		netif_err(priv, drv, priv->dev, "MTU %d below minimum MTU\n",

			  mtu);

		dev_err(&priv->pdev->dev, "MTU %d below minimum MTU\n", mtu);

		err = -EINVAL;

		goto free_device_descriptor;

	}
@@ -362,11 +359,11 @@ int gve_adminq_describe_device(struct gve_priv *priv) 
	priv->num_event_counters = be16_to_cpu(descriptor->counters);

	ether_addr_copy(priv->dev->dev_addr, descriptor->mac);

	mac = descriptor->mac;

	netif_info(priv, drv, priv->dev, "MAC addr: %pM\n", mac);

	dev_info(&priv->pdev->dev, "MAC addr: %pM\n", mac);

	priv->tx_pages_per_qpl = be16_to_cpu(descriptor->tx_pages_per_qpl);

	priv->rx_pages_per_qpl = be16_to_cpu(descriptor->rx_pages_per_qpl);

	if (priv->rx_pages_per_qpl < priv->rx_desc_cnt) {

		netif_err(priv, drv, priv->dev, "rx_pages_per_qpl cannot be smaller than rx_desc_cnt, setting rx_desc_cnt down to %d.\n",

		dev_err(&priv->pdev->dev, "rx_pages_per_qpl cannot be smaller than rx_desc_cnt, setting rx_desc_cnt down to %d.\n",

			priv->rx_pages_per_qpl);

		priv->rx_desc_cnt = priv->rx_pages_per_qpl;

	}

drivers/net/ethernet/google/gve/gve_main.c

+5 −5
Original line number Diff line number Diff line
@@ -930,7 +930,7 @@ static int gve_init_priv(struct gve_priv *priv, bool skip_describe_device) 
		priv->dev->max_mtu = PAGE_SIZE;

		err = gve_adminq_set_mtu(priv, priv->dev->mtu);

		if (err) {

			netif_err(priv, drv, priv->dev, "Could not set mtu");

			dev_err(&priv->pdev->dev, "Could not set mtu");

			goto err;

		}

	}
@@ -970,9 +970,9 @@ static int gve_init_priv(struct gve_priv *priv, bool skip_describe_device) 
						priv->rx_cfg.num_queues);

	}



	netif_info(priv, drv, priv->dev, "TX queues %d, RX queues %d\n",

	dev_info(&priv->pdev->dev, "TX queues %d, RX queues %d\n",

		 priv->tx_cfg.num_queues, priv->rx_cfg.num_queues);

	netif_info(priv, drv, priv->dev, "Max TX queues %d, Max RX queues %d\n",

	dev_info(&priv->pdev->dev, "Max TX queues %d, Max RX queues %d\n",

		 priv->tx_cfg.max_queues, priv->rx_cfg.max_queues);



setup_device: