Commit 6da96e6e authored by Juerg Haefliger's avatar Juerg Haefliger Committed by Wim Van Sebroeck

watchdog: ziirave_wdt: Remove VERSION_FMT defines and add sysfs newlines

Remove the ZIIRAVE_{BL,FW}_VERION_FMT defines since they're only used in
very few places. While at it, add newlines to sysfs outputs.
Suggested-By: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJuerg Haefliger <juergh@canonical.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20210520072918.76482-1-juergh@canonical.comSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent b326f2c8
...@@ -69,9 +69,6 @@ static char *ziirave_reasons[] = {"power cycle", "hw watchdog", NULL, NULL, ...@@ -69,9 +69,6 @@ static char *ziirave_reasons[] = {"power cycle", "hw watchdog", NULL, NULL,
#define ZIIRAVE_CMD_JUMP_TO_BOOTLOADER_MAGIC 1 #define ZIIRAVE_CMD_JUMP_TO_BOOTLOADER_MAGIC 1
#define ZIIRAVE_CMD_RESET_PROCESSOR_MAGIC 1 #define ZIIRAVE_CMD_RESET_PROCESSOR_MAGIC 1
#define ZIIRAVE_FW_VERSION_FMT "02.%02u.%02u"
#define ZIIRAVE_BL_VERSION_FMT "01.%02u.%02u"
struct ziirave_wdt_rev { struct ziirave_wdt_rev {
unsigned char major; unsigned char major;
unsigned char minor; unsigned char minor;
...@@ -445,7 +442,7 @@ static ssize_t ziirave_wdt_sysfs_show_firm(struct device *dev, ...@@ -445,7 +442,7 @@ static ssize_t ziirave_wdt_sysfs_show_firm(struct device *dev,
if (ret) if (ret)
return ret; return ret;
ret = sysfs_emit(buf, ZIIRAVE_FW_VERSION_FMT, ret = sysfs_emit(buf, "02.%02u.%02u\n",
w_priv->firmware_rev.major, w_priv->firmware_rev.major,
w_priv->firmware_rev.minor); w_priv->firmware_rev.minor);
...@@ -469,7 +466,7 @@ static ssize_t ziirave_wdt_sysfs_show_boot(struct device *dev, ...@@ -469,7 +466,7 @@ static ssize_t ziirave_wdt_sysfs_show_boot(struct device *dev,
if (ret) if (ret)
return ret; return ret;
ret = sysfs_emit(buf, ZIIRAVE_BL_VERSION_FMT, ret = sysfs_emit(buf, "01.%02u.%02u\n",
w_priv->bootloader_rev.major, w_priv->bootloader_rev.major,
w_priv->bootloader_rev.minor); w_priv->bootloader_rev.minor);
...@@ -493,7 +490,7 @@ static ssize_t ziirave_wdt_sysfs_show_reason(struct device *dev, ...@@ -493,7 +490,7 @@ static ssize_t ziirave_wdt_sysfs_show_reason(struct device *dev,
if (ret) if (ret)
return ret; return ret;
ret = sysfs_emit(buf, "%s", ziirave_reasons[w_priv->reset_reason]); ret = sysfs_emit(buf, "%s\n", ziirave_reasons[w_priv->reset_reason]);
mutex_unlock(&w_priv->sysfs_mutex); mutex_unlock(&w_priv->sysfs_mutex);
...@@ -538,7 +535,7 @@ static ssize_t ziirave_wdt_sysfs_store_firm(struct device *dev, ...@@ -538,7 +535,7 @@ static ssize_t ziirave_wdt_sysfs_store_firm(struct device *dev,
} }
dev_info(&client->dev, dev_info(&client->dev,
"Firmware updated to version " ZIIRAVE_FW_VERSION_FMT "\n", "Firmware updated to version 02.%02u.%02u\n",
w_priv->firmware_rev.major, w_priv->firmware_rev.minor); w_priv->firmware_rev.major, w_priv->firmware_rev.minor);
/* Restore the watchdog timeout */ /* Restore the watchdog timeout */
...@@ -679,7 +676,7 @@ static int ziirave_wdt_probe(struct i2c_client *client, ...@@ -679,7 +676,7 @@ static int ziirave_wdt_probe(struct i2c_client *client,
} }
dev_info(&client->dev, dev_info(&client->dev,
"Firmware version: " ZIIRAVE_FW_VERSION_FMT "\n", "Firmware version: 02.%02u.%02u\n",
w_priv->firmware_rev.major, w_priv->firmware_rev.minor); w_priv->firmware_rev.major, w_priv->firmware_rev.minor);
ret = ziirave_wdt_revision(client, &w_priv->bootloader_rev, ret = ziirave_wdt_revision(client, &w_priv->bootloader_rev,
...@@ -690,7 +687,7 @@ static int ziirave_wdt_probe(struct i2c_client *client, ...@@ -690,7 +687,7 @@ static int ziirave_wdt_probe(struct i2c_client *client,
} }
dev_info(&client->dev, dev_info(&client->dev,
"Bootloader version: " ZIIRAVE_BL_VERSION_FMT "\n", "Bootloader version: 01.%02u.%02u\n",
w_priv->bootloader_rev.major, w_priv->bootloader_rev.minor); w_priv->bootloader_rev.major, w_priv->bootloader_rev.minor);
w_priv->reset_reason = i2c_smbus_read_byte_data(client, w_priv->reset_reason = i2c_smbus_read_byte_data(client,
......
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