Commit 3968540b authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Jeff Kirsher

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: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 43f8b224
...@@ -45,6 +45,9 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw) ...@@ -45,6 +45,9 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw)
/** /**
* ice_clear_pf_cfg - Clear PF configuration * ice_clear_pf_cfg - Clear PF configuration
* @hw: pointer to the hardware structure * @hw: pointer to the hardware structure
*
* Clears any existing PF configuration (VSIs, VSI lists, switch rules, port
* configuration, flow director filters, etc.).
*/ */
enum ice_status ice_clear_pf_cfg(struct ice_hw *hw) enum ice_status ice_clear_pf_cfg(struct ice_hw *hw)
{ {
......
...@@ -901,7 +901,7 @@ static int __ice_clean_ctrlq(struct ice_pf *pf, enum ice_ctl_q q_type) ...@@ -901,7 +901,7 @@ static int __ice_clean_ctrlq(struct ice_pf *pf, enum ice_ctl_q q_type)
case ice_aqc_opc_get_link_status: case ice_aqc_opc_get_link_status:
if (ice_handle_link_event(pf)) if (ice_handle_link_event(pf))
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"Could not handle link event"); "Could not handle link event\n");
break; break;
default: default:
dev_dbg(&pf->pdev->dev, dev_dbg(&pf->pdev->dev,
...@@ -3284,7 +3284,7 @@ static int ice_probe(struct pci_dev *pdev, ...@@ -3284,7 +3284,7 @@ static int ice_probe(struct pci_dev *pdev,
err = pcim_iomap_regions(pdev, BIT(ICE_BAR0), pci_name(pdev)); err = pcim_iomap_regions(pdev, BIT(ICE_BAR0), pci_name(pdev));
if (err) { if (err) {
dev_err(&pdev->dev, "I/O map error %d\n", err); dev_err(&pdev->dev, "BAR0 I/O map error %d\n", err);
return err; return err;
} }
...@@ -5252,7 +5252,7 @@ static int ice_change_mtu(struct net_device *netdev, int new_mtu) ...@@ -5252,7 +5252,7 @@ static int ice_change_mtu(struct net_device *netdev, int new_mtu)
u8 count = 0; u8 count = 0;
if (new_mtu == netdev->mtu) { if (new_mtu == netdev->mtu) {
netdev_warn(netdev, "mtu is already %d\n", netdev->mtu); netdev_warn(netdev, "mtu is already %u\n", netdev->mtu);
return 0; return 0;
} }
......
...@@ -131,9 +131,8 @@ ice_read_sr_word_aq(struct ice_hw *hw, u16 offset, u16 *data) ...@@ -131,9 +131,8 @@ ice_read_sr_word_aq(struct ice_hw *hw, u16 offset, u16 *data)
* *
* This function will request NVM ownership. * This function will request NVM ownership.
*/ */
static enum static enum ice_status
ice_status ice_acquire_nvm(struct ice_hw *hw, ice_acquire_nvm(struct ice_hw *hw, enum ice_aq_res_access_type access)
enum ice_aq_res_access_type access)
{ {
if (hw->nvm.blank_nvm_mode) if (hw->nvm.blank_nvm_mode)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment