intel-mid_wdt: Error code is just an integer
PATCH 1/1 intel-mid_wdt: Error code is just an integer
Error code when printed is more readable if it's represented as plain decimal integer. Otherwise user will see something like
intel_mid_wdt: Error stopping watchdog: 0xffffffed
which is not quite understandable ("Should I interpret it as a bitfield?").
Make it clear to use plaint integer specifier.
While here, move struct device *dev local variable definition to the top of functions.
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/watchdog/intel-mid_wdt.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/watchdog/intel-mid_wdt.c +8 -11
@@ -43,6 +43,7 @@ static inline int wdt_command(int sub, u32 *in, int inlen)static int wdt_start (struct watchdog_device *wd) { +struct device *dev =watchdog_get_drvdata (wd);int ret, in_size;int timeout = wd->timeout; struct ipc_wd_start {
@@ -57,36 +58,32 @@ static int wdt_start(struct watchdog_device *wd) in_size =DIV_ROUND_UP (sizeof (ipc_wd_start),4 ); ret =wdt_command (SCU_WATCHDOG_START , (u32 *)&ipc_wd_start, in_size); -if (ret) { -struct device *dev =watchdog_get_drvdata (wd); +if (ret)dev_crit (dev,"error starting watchdog: %d\n" , ret); - }return ret; }static int wdt_ping (struct watchdog_device *wd) { +struct device *dev =watchdog_get_drvdata (wd);int ret; ret =wdt_command (SCU_WATCHDOG_KEEPALIVE ,NULL ,0 ); -if (ret) { -struct device *dev =watchdog_get_drvdata (wd); -dev_crit (dev,"Error executing keepalive: 0x%x\n" , ret); - } +if (ret) +dev_crit (dev,"Error executing keepalive: %d\n" , ret);return ret; }static int wdt_stop (struct watchdog_device *wd) { +struct device *dev =watchdog_get_drvdata (wd);int ret; ret =wdt_command (SCU_WATCHDOG_STOP ,NULL ,0 ); -if (ret) { -struct device *dev =watchdog_get_drvdata (wd); -dev_crit (dev,"Error stopping watchdog: 0x%x\n" , ret); - } +if (ret) +dev_crit (dev,"Error stopping watchdog: %d\n" , ret);return ret; }
Signature · 1 line
2.10.2
Quoted 11 lines · Andy Shevchenko
Error code when printed is more readable if it's represented as plain decimal integer. Otherwise user will see something like
intel_mid_wdt: Error stopping watchdog: 0xffffffedwhich is not quite understandable ("Should I interpret it as a bitfield?").
Make it clear to use plaint integer specifier.
While here, move struct device *dev local variable definition to the top of functions.
Signed-off-by Andy Shevchenko <[email protected]>
Reviewed-by Guenter Roeck <[email protected]>
Quoted 63 lines
--- drivers/watchdog/intel-mid_wdt.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)drivers/watchdog/intel-mid_wdt.c +8
-11@@ -43,6 +43,7 @@ static inline int wdt_command(int sub, u32 *in, int inlen)static int wdt_start (struct watchdog_device *wd) { +struct device *dev =watchdog_get_drvdata (wd);int ret, in_size;int timeout = wd->timeout; struct ipc_wd_start {@@ -57,36 +58,32 @@ static int wdt_start(struct watchdog_device *wd) in_size =DIV_ROUND_UP (sizeof (ipc_wd_start),4 ); ret =wdt_command (SCU_WATCHDOG_START , (u32 *)&ipc_wd_start, in_size); -if (ret) { -struct device *dev =watchdog_get_drvdata (wd); +if (ret)dev_crit (dev,"error starting watchdog: %d\n" , ret); - }return ret; }static int wdt_ping (struct watchdog_device *wd) { +struct device *dev =watchdog_get_drvdata (wd);int ret; ret =wdt_command (SCU_WATCHDOG_KEEPALIVE ,NULL ,0 ); -if (ret) { -struct device *dev =watchdog_get_drvdata (wd); -dev_crit (dev,"Error executing keepalive: 0x%x\n" , ret); - } +if (ret) +dev_crit (dev,"Error executing keepalive: %d\n" , ret);return ret; }static int wdt_stop (struct watchdog_device *wd) { +struct device *dev =watchdog_get_drvdata (wd);int ret; ret =wdt_command (SCU_WATCHDOG_STOP ,NULL ,0 ); -if (ret) { -struct device *dev =watchdog_get_drvdata (wd); -dev_crit (dev,"Error stopping watchdog: 0x%x\n" , ret); - } +if (ret) +dev_crit (dev,"Error stopping watchdog: %d\n" , ret);return ret; }Signature · 1 line
2.10.2