aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2015-10-28 17:19:56 -0700
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2015-12-13 15:28:38 -0800
commit3d02b3df733af0531789fff3fc999f9ca843b66e (patch)
treee51e243e86cb2ec27de4f8db6e87e9f51d5db2c6 /drivers/net/ethernet/intel/fm10k/fm10k_pci.c
parentfm10k: cleanup namespace pollution (diff)
downloadlinux-dev-3d02b3df733af0531789fff3fc999f9ca843b66e.tar.xz
linux-dev-3d02b3df733af0531789fff3fc999f9ca843b66e.zip
fm10k: cleanup overly long lines
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/fm10k/fm10k_pci.c')
-rw-r--r--drivers/net/ethernet/intel/fm10k/fm10k_pci.c29
1 files changed, 16 insertions, 13 deletions
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index 84424a86954c..e820b5f34eeb 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -180,7 +180,8 @@ static void fm10k_reinit(struct fm10k_intfc *interface)
err = fm10k_init_queueing_scheme(interface);
if (err) {
- dev_err(&interface->pdev->dev, "init_queueing_scheme failed: %d\n", err);
+ dev_err(&interface->pdev->dev,
+ "init_queueing_scheme failed: %d\n", err);
goto reinit_err;
}
@@ -1866,17 +1867,18 @@ static void fm10k_slot_warn(struct fm10k_intfc *interface)
return;
}
- if (max_gts < expected_gts) {
- dev_warn(&interface->pdev->dev,
- "This device requires %dGT/s of bandwidth for optimal performance.\n",
- expected_gts);
- dev_warn(&interface->pdev->dev,
- "A %sslot with x%d lanes is suggested.\n",
- (hw->bus_caps.speed == fm10k_bus_speed_2500 ? "2.5GT/s " :
- hw->bus_caps.speed == fm10k_bus_speed_5000 ? "5.0GT/s " :
- hw->bus_caps.speed == fm10k_bus_speed_8000 ? "8.0GT/s " : ""),
- hw->bus_caps.width);
- }
+ if (max_gts >= expected_gts)
+ return;
+
+ dev_warn(&interface->pdev->dev,
+ "This device requires %dGT/s of bandwidth for optimal performance.\n",
+ expected_gts);
+ dev_warn(&interface->pdev->dev,
+ "A %sslot with x%d lanes is suggested.\n",
+ (hw->bus_caps.speed == fm10k_bus_speed_2500 ? "2.5GT/s " :
+ hw->bus_caps.speed == fm10k_bus_speed_5000 ? "5.0GT/s " :
+ hw->bus_caps.speed == fm10k_bus_speed_8000 ? "8.0GT/s " : ""),
+ hw->bus_caps.width);
}
/**
@@ -2294,7 +2296,8 @@ static void fm10k_io_resume(struct pci_dev *pdev)
err = fm10k_init_queueing_scheme(interface);
if (err) {
- dev_err(&interface->pdev->dev, "init_queueing_scheme failed: %d\n", err);
+ dev_err(&interface->pdev->dev,
+ "init_queueing_scheme failed: %d\n", err);
return;
}