net: e1000: fix <NULL>s in log messages
PATCH 1/1 net: e1000: fix <NULL>s in log messages
We do not have an edev.dev set up yet when we are filling in the device structure and reading an EEPROM in probe. Besides, using hw->dev for those messages seems more appropriate.
Signed-off-by Denis Orlov <[email protected]>
--- drivers/net/e1000/eeprom.c | 6 +++--- drivers/net/e1000/main.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/e1000/eeprom.c +3 -3
@@ -800,7 +800,7 @@ int e1000_validate_eeprom_checksum(struct e1000_hw *hw)/* Read the EEPROM */ if (e1000_read_eeprom (hw,0 ,EEPROM_CHECKSUM_REG +1 , buf) <0 ) { -dev_err (&hw->edev.dev,"Unable to read EEPROM!\n" ); +dev_err (hw->dev,"Unable to read EEPROM!\n" );return -E1000_ERR_EEPROM ; }
@@ -816,8 +816,8 @@ int e1000_validate_eeprom_checksum(struct e1000_hw *hw)return 0 ;/* Hrm, verification failed, print an error */ -dev_err (&hw->edev.dev,"EEPROM checksum is incorrect!\n" ); -dev_err (&hw->edev.dev," ...register was 0x%04hx, calculated 0x%04hx\n" , +dev_err (hw->dev,"EEPROM checksum is incorrect!\n" ); +dev_err (hw->dev," ...register was 0x%04hx, calculated 0x%04hx\n" , checksum_reg, checksum);return -E1000_ERR_EEPROM ;
drivers/net/e1000/main.c +1 -1
@@ -3226,7 +3226,7 @@ static int e1000_sw_init(struct eth_device *edev)/* identify the MAC */ result =e1000_set_mac_type (hw);if (result) { -dev_err (&hw->edev.dev,"Unknown MAC Type\n" ); +dev_err (hw->dev,"Unknown MAC Type\n" );return result; }
Signature · 1 line
2.30.2
Quoted 5 lines · Denis Orlov
We do not have an edev.dev set up yet when we are filling in the device structure and reading an EEPROM in probe. Besides, using
hw->devfor those messages seems more appropriate.Signed-off-by Denis Orlov <[email protected]>
Reviewed-by Ahmad Fatoum <[email protected]>
Quoted 42 lines
--- drivers/net/e1000/eeprom.c | 6 +++--- drivers/net/e1000/main.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)drivers/net/e1000/eeprom.c +3
-3@@ -800,7 +800,7 @@ int e1000_validate_eeprom_checksum(struct e1000_hw *hw)/* Read the EEPROM */ if (e1000_read_eeprom (hw,0 ,EEPROM_CHECKSUM_REG +1 , buf) <0 ) { -dev_err (&hw->edev.dev,"Unable to read EEPROM!\n" ); +dev_err (hw->dev,"Unable to read EEPROM!\n" );return -E1000_ERR_EEPROM ; }@@ -816,8 +816,8 @@ int e1000_validate_eeprom_checksum(struct e1000_hw *hw)return 0 ;/* Hrm, verification failed, print an error */ -dev_err (&hw->edev.dev,"EEPROM checksum is incorrect!\n" ); -dev_err (&hw->edev.dev," ...register was 0x%04hx, calculated 0x%04hx\n" , +dev_err (hw->dev,"EEPROM checksum is incorrect!\n" ); +dev_err (hw->dev," ...register was 0x%04hx, calculated 0x%04hx\n" , checksum_reg, checksum);return -E1000_ERR_EEPROM ;drivers/net/e1000/main.c +1
-1@@ -3226,7 +3226,7 @@ static int e1000_sw_init(struct eth_device *edev)/* identify the MAC */ result =e1000_set_mac_type (hw);if (result) { -dev_err (&hw->edev.dev,"Unknown MAC Type\n" ); +dev_err (hw->dev,"Unknown MAC Type\n" );return result; }
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Sascha Hauer
AppliedQuoted 9 lines · Denis Orlov
We do not have an edev.dev set up yet when we are filling in the device structure and reading an EEPROM in probe. Besides, using
hw->devfor those messages seems more appropriate.Signed-off-by Denis Orlov <[email protected]>--- drivers/net/e1000/eeprom.c | 6 +++--- drivers/net/e1000/main.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
Applied, thanks
Sascha
Quoted 42 lines
drivers/net/e1000/eeprom.c +3
-3@@ -800,7 +800,7 @@ int e1000_validate_eeprom_checksum(struct e1000_hw *hw)/* Read the EEPROM */ if (e1000_read_eeprom (hw,0 ,EEPROM_CHECKSUM_REG +1 , buf) <0 ) { -dev_err (&hw->edev.dev,"Unable to read EEPROM!\n" ); +dev_err (hw->dev,"Unable to read EEPROM!\n" );return -E1000_ERR_EEPROM ; }@@ -816,8 +816,8 @@ int e1000_validate_eeprom_checksum(struct e1000_hw *hw)return 0 ;/* Hrm, verification failed, print an error */ -dev_err (&hw->edev.dev,"EEPROM checksum is incorrect!\n" ); -dev_err (&hw->edev.dev," ...register was 0x%04hx, calculated 0x%04hx\n" , +dev_err (hw->dev,"EEPROM checksum is incorrect!\n" ); +dev_err (hw->dev," ...register was 0x%04hx, calculated 0x%04hx\n" , checksum_reg, checksum);return -E1000_ERR_EEPROM ;drivers/net/e1000/main.c +1
-1@@ -3226,7 +3226,7 @@ static int e1000_sw_init(struct eth_device *edev)/* identify the MAC */ result =e1000_set_mac_type (hw);if (result) { -dev_err (&hw->edev.dev,"Unknown MAC Type\n" ); +dev_err (hw->dev,"Unknown MAC Type\n" );return result; }Signature · 1 line
2.30.2
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |