i40evf: clean up init error messages

Add an error message when the admin queue message never completes, and
fix formatting on another one that was unnecessarily wrapped.

Change-ID: I8b8a4eb7629d741f09357250144023cd4a72231f
Signed-off-by: Mitch Williams <[email protected]>
Signed-off-by: Catherine Sullivan <[email protected]>
Tested-by: Sibai Li <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 4d547abc59dc5791f844cc6d9efadd7da595758f..d3eafa320ba951d898da92bd5fab085fa30fc5b5 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1968,8 +1968,7 @@ static void i40evf_init_task(struct work_struct *work)
                }
                err = i40evf_send_api_ver(adapter);
                if (err) {
-                       dev_err(&pdev->dev, "Unable to send to PF (%d)\n",
-                               err);
+                       dev_err(&pdev->dev, "Unable to send to PF (%d)\n", err);
                        i40evf_shutdown_adminq(hw);
                        goto err;
                }
@@ -1977,8 +1976,10 @@ static void i40evf_init_task(struct work_struct *work)
                goto restart;
                break;
        case __I40EVF_INIT_VERSION_CHECK:
-               if (!i40evf_asq_done(hw))
+               if (!i40evf_asq_done(hw)) {
+                       dev_err(&pdev->dev, "Admin queue command never completed.\n");
                        goto err;
+               }
 
                /* aq msg sent, awaiting reply */
                err = i40evf_verify_api_ver(adapter);