aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/i40evf/i40evf_main.c
diff options
context:
space:
mode:
authorMitch Williams <mitch.a.williams@intel.com>2014-03-06 03:59:53 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-03-21 04:39:08 -0400
commit10bdd67b4a19e0e4cd96ca0591adcde80907874d (patch)
tree418ced9610e7e2b0e60697680f9b38c7cbf42409 /drivers/net/ethernet/intel/i40evf/i40evf_main.c
parentc89a9e00f90cea4d824ff5890c86332a6687f830 (diff)
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 <mitch.a.williams@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/i40evf/i40evf_main.c')
-rw-r--r--drivers/net/ethernet/intel/i40evf/i40evf_main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 4d547abc59dc..d3eafa320ba9 100644
--- 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)
1968 } 1968 }
1969 err = i40evf_send_api_ver(adapter); 1969 err = i40evf_send_api_ver(adapter);
1970 if (err) { 1970 if (err) {
1971 dev_err(&pdev->dev, "Unable to send to PF (%d)\n", 1971 dev_err(&pdev->dev, "Unable to send to PF (%d)\n", err);
1972 err);
1973 i40evf_shutdown_adminq(hw); 1972 i40evf_shutdown_adminq(hw);
1974 goto err; 1973 goto err;
1975 } 1974 }
@@ -1977,8 +1976,10 @@ static void i40evf_init_task(struct work_struct *work)
1977 goto restart; 1976 goto restart;
1978 break; 1977 break;
1979 case __I40EVF_INIT_VERSION_CHECK: 1978 case __I40EVF_INIT_VERSION_CHECK:
1980 if (!i40evf_asq_done(hw)) 1979 if (!i40evf_asq_done(hw)) {
1980 dev_err(&pdev->dev, "Admin queue command never completed.\n");
1981 goto err; 1981 goto err;
1982 }
1982 1983
1983 /* aq msg sent, awaiting reply */ 1984 /* aq msg sent, awaiting reply */
1984 err = i40evf_verify_api_ver(adapter); 1985 err = i40evf_verify_api_ver(adapter);