ice: fix and consolidate logging of NVM/firmware version information

Browse source

[ Upstream commit fbf1e1f698 ]

Logging the firmware/NVM information during driver load is redundant since
that information is also available via ethtool.  Move the functionality
found in ice_nvm_version_str() directly into ice_get_drvinfo() and remove
calling the former and logging that info during driver probe.  This also
gets rid of a bug in ice_nvm_version_str() where it returns a pointer to
a buffer which is free'ed when that function exits.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

...

This commit is contained in:

Bruce Allan 2020-02-06 01:20:06 -08:00 • committed by Greg Kroah-Hartman

parent c332e75342

commit 21c3e746ca

4 changed files with 13 additions and 28 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

15

drivers/net/ethernet/intel/ice/ice_ethtool.c

View file

19

drivers/net/ethernet/intel/ice/ice_lib.c

View file

2

drivers/net/ethernet/intel/ice/ice_lib.h

View file

5

drivers/net/ethernet/intel/ice/ice_main.c

View file