Re: [PATCH net-next 11/15] nfp: don't use netdev_warn() before netdev is registered

2017-03-22 Thread Sergei Shtylyov

Hello!

On 3/22/2017 3:59 AM, Jakub Kicinski wrote:


Fix warning which was using netdev_warn() instead of dev_warn()


   I'm seeing nn_warn()...


to early.


   Too. :-)


Signed-off-by: Jakub Kicinski 
---
 drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c 
b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index f134f1808b9a..19f9d95faea4 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -336,9 +336,9 @@ nfp_net_irqs_assign(struct nfp_net *nn, struct msix_entry 
*irq_entries,

if (dp->num_rx_rings > dp->num_r_vecs ||
dp->num_tx_rings > dp->num_r_vecs)
-   nn_warn(nn, "More rings (%d,%d) than vectors (%d).\n",
-   dp->num_rx_rings, dp->num_tx_rings,
-   dp->num_r_vecs);
+   dev_warn(nn->dp.dev, "More rings (%d,%d) than vectors (%d).\n",
+dp->num_rx_rings, dp->num_tx_rings,
+dp->num_r_vecs);

dp->num_rx_rings = min(dp->num_r_vecs, dp->num_rx_rings);
dp->num_tx_rings = min(dp->num_r_vecs, dp->num_tx_rings);


MBR, Sergei



[PATCH net-next 11/15] nfp: don't use netdev_warn() before netdev is registered

2017-03-21 Thread Jakub Kicinski
Fix warning which was using netdev_warn() instead of dev_warn()
to early.

Signed-off-by: Jakub Kicinski 
---
 drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c 
b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index f134f1808b9a..19f9d95faea4 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -336,9 +336,9 @@ nfp_net_irqs_assign(struct nfp_net *nn, struct msix_entry 
*irq_entries,
 
if (dp->num_rx_rings > dp->num_r_vecs ||
dp->num_tx_rings > dp->num_r_vecs)
-   nn_warn(nn, "More rings (%d,%d) than vectors (%d).\n",
-   dp->num_rx_rings, dp->num_tx_rings,
-   dp->num_r_vecs);
+   dev_warn(nn->dp.dev, "More rings (%d,%d) than vectors (%d).\n",
+dp->num_rx_rings, dp->num_tx_rings,
+dp->num_r_vecs);
 
dp->num_rx_rings = min(dp->num_r_vecs, dp->num_rx_rings);
dp->num_tx_rings = min(dp->num_r_vecs, dp->num_tx_rings);
-- 
2.11.0