nfp: avoid halt of driver init process when non-fatal error happens

It's not a fatal error when setting `hwinfo` into management firmware
fails, no need to halt the whole driver initialization process.

Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
index e2d4c487e8de9a0a3f6802a9b70ca29463855dc6..f3852ba8099a4aef02098f32764e8cffeb022879 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
@@ -315,18 +315,17 @@ static int nfp_net_pf_cfg_nsp(struct nfp_pf *pf, bool sp_indiff)
        int err;
 
        nsp = nfp_nsp_open(pf->cpp);
-       if (IS_ERR(nsp)) {
-               err = PTR_ERR(nsp);
-               return err;
-       }
+       if (IS_ERR(nsp))
+               return PTR_ERR(nsp);
 
        snprintf(hwinfo, sizeof(hwinfo), "sp_indiff=%d", sp_indiff);
        err = nfp_nsp_hwinfo_set(nsp, hwinfo, sizeof(hwinfo));
+       /* Not a fatal error, no need to return error to stop driver from loading */
        if (err)
                nfp_warn(pf->cpp, "HWinfo(sp_indiff=%d) set failed: %d\n", sp_indiff, err);
 
        nfp_nsp_close(nsp);
-       return err;
+       return 0;
 }
 
 static int nfp_net_pf_init_nsp(struct nfp_pf *pf)