[PATCH 10/6] net/e1000: indicate in error messages where the failure occured

Uwe Kleine-König u.kleine-koenig at pengutronix.de
Thu Nov 23 03:12:36 PST 2017


There used to be four places that all emit the same error message. Even
if in a given context not all four of them can be relevant, there are
always two possible locations where the message can origin from.

So make the output slightly different in all places to ease future
debugging.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
---
 drivers/net/e1000/eeprom.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c
index afd129b79fab..0d91a88bd74f 100644
--- a/drivers/net/e1000/eeprom.c
+++ b/drivers/net/e1000/eeprom.c
@@ -708,7 +708,7 @@ static int e1000_flash_mode_wait_for_idle(struct e1000_hw *hw)
 				       E1000_FLSWCTL_DONE, SECOND);
 	if (ret < 0)
 		dev_err(hw->dev,
-			"Timeout waiting for FLSWCTL.DONE to be set\n");
+			"Timeout waiting for FLSWCTL.DONE to be set (wait)\n");
 	return ret;
 }
 
@@ -764,7 +764,7 @@ static int e1000_flash_mode_read_chunk(struct e1000_hw *hw, loff_t offset,
 				     SECOND);
 		if (ret < 0) {
 			dev_err(hw->dev,
-				"Timeout waiting for FLSWCTL.DONE to be set\n");
+				"Timeout waiting for FLSWCTL.DONE to be set (read)\n");
 			return ret;
 		}
 
@@ -820,7 +820,7 @@ static int e1000_flash_mode_write_chunk(struct e1000_hw *hw, loff_t offset,
 				     SECOND);
 		if (ret < 0) {
 			dev_err(hw->dev,
-				"Timeout waiting for FLSWCTL.DONE to be set\n");
+				"Timeout waiting for FLSWCTL.DONE to be set (write)\n");
 			return ret;
 		}
 
@@ -857,7 +857,7 @@ static int e1000_flash_mode_erase_chunk(struct e1000_hw *hw, loff_t offset,
 			     SECOND);
 	if (ret < 0) {
 		dev_err(hw->dev,
-			"Timeout waiting for FLSWCTL.DONE to be set\n");
+			"Timeout waiting for FLSWCTL.DONE to be set (erase)\n");
 		return ret;
 	}
 
-- 
2.11.0




More information about the barebox mailing list