diff options
| author | Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> | 2018-08-09 09:29:03 -0400 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2018-08-23 14:34:26 -0400 |
| commit | 3968540ba61e9a19a0c4bda733db70952708d264 (patch) | |
| tree | a58a11cfdc2d62bcc87db92705e47653daa7c0c5 | |
| parent | 43f8b22450f0a721915f1d2c7e3db6dd9573e76b (diff) | |
ice: Trivial formatting fixes
1) Add missing "\n" when printing link event error message.
2) Update dev_err statement in probe.
3) Add function description for ice_clear_pf_cfg.
4) Fix coding style for ice_acquire_nvm.
5) netdev->mtu is unsigned so use %u.
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Tony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_common.c | 3 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_main.c | 6 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_nvm.c | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c index ebd701ac9428..661beea6af79 100644 --- a/drivers/net/ethernet/intel/ice/ice_common.c +++ b/drivers/net/ethernet/intel/ice/ice_common.c | |||
| @@ -45,6 +45,9 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw) | |||
| 45 | /** | 45 | /** |
| 46 | * ice_clear_pf_cfg - Clear PF configuration | 46 | * ice_clear_pf_cfg - Clear PF configuration |
| 47 | * @hw: pointer to the hardware structure | 47 | * @hw: pointer to the hardware structure |
| 48 | * | ||
| 49 | * Clears any existing PF configuration (VSIs, VSI lists, switch rules, port | ||
| 50 | * configuration, flow director filters, etc.). | ||
| 48 | */ | 51 | */ |
| 49 | enum ice_status ice_clear_pf_cfg(struct ice_hw *hw) | 52 | enum ice_status ice_clear_pf_cfg(struct ice_hw *hw) |
| 50 | { | 53 | { |
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index e23156515186..f1e80eed2fd6 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c | |||
| @@ -901,7 +901,7 @@ static int __ice_clean_ctrlq(struct ice_pf *pf, enum ice_ctl_q q_type) | |||
| 901 | case ice_aqc_opc_get_link_status: | 901 | case ice_aqc_opc_get_link_status: |
| 902 | if (ice_handle_link_event(pf)) | 902 | if (ice_handle_link_event(pf)) |
| 903 | dev_err(&pf->pdev->dev, | 903 | dev_err(&pf->pdev->dev, |
| 904 | "Could not handle link event"); | 904 | "Could not handle link event\n"); |
| 905 | break; | 905 | break; |
| 906 | default: | 906 | default: |
| 907 | dev_dbg(&pf->pdev->dev, | 907 | dev_dbg(&pf->pdev->dev, |
| @@ -3284,7 +3284,7 @@ static int ice_probe(struct pci_dev *pdev, | |||
| 3284 | 3284 | ||
| 3285 | err = pcim_iomap_regions(pdev, BIT(ICE_BAR0), pci_name(pdev)); | 3285 | err = pcim_iomap_regions(pdev, BIT(ICE_BAR0), pci_name(pdev)); |
| 3286 | if (err) { | 3286 | if (err) { |
| 3287 | dev_err(&pdev->dev, "I/O map error %d\n", err); | 3287 | dev_err(&pdev->dev, "BAR0 I/O map error %d\n", err); |
| 3288 | return err; | 3288 | return err; |
| 3289 | } | 3289 | } |
| 3290 | 3290 | ||
| @@ -5252,7 +5252,7 @@ static int ice_change_mtu(struct net_device *netdev, int new_mtu) | |||
| 5252 | u8 count = 0; | 5252 | u8 count = 0; |
| 5253 | 5253 | ||
| 5254 | if (new_mtu == netdev->mtu) { | 5254 | if (new_mtu == netdev->mtu) { |
| 5255 | netdev_warn(netdev, "mtu is already %d\n", netdev->mtu); | 5255 | netdev_warn(netdev, "mtu is already %u\n", netdev->mtu); |
| 5256 | return 0; | 5256 | return 0; |
| 5257 | } | 5257 | } |
| 5258 | 5258 | ||
diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/ethernet/intel/ice/ice_nvm.c index 92da0a626ce0..295a8cd87fc1 100644 --- a/drivers/net/ethernet/intel/ice/ice_nvm.c +++ b/drivers/net/ethernet/intel/ice/ice_nvm.c | |||
| @@ -131,9 +131,8 @@ ice_read_sr_word_aq(struct ice_hw *hw, u16 offset, u16 *data) | |||
| 131 | * | 131 | * |
| 132 | * This function will request NVM ownership. | 132 | * This function will request NVM ownership. |
| 133 | */ | 133 | */ |
| 134 | static enum | 134 | static enum ice_status |
| 135 | ice_status ice_acquire_nvm(struct ice_hw *hw, | 135 | ice_acquire_nvm(struct ice_hw *hw, enum ice_aq_res_access_type access) |
| 136 | enum ice_aq_res_access_type access) | ||
| 137 | { | 136 | { |
| 138 | if (hw->nvm.blank_nvm_mode) | 137 | if (hw->nvm.blank_nvm_mode) |
| 139 | return 0; | 138 | return 0; |
