From: Guenter Roeck <linux@roeck-us.net>
To: Juerg Haefliger <juerg.haefliger@canonical.com>
Cc: joe@perches.com, Wim Van Sebroeck <wim@linux-watchdog.org>,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org,
Juerg Haefliger <juergh@canonical.com>
Subject: Re: [PATCH] watchdog: ziirave_wdt: Remove VERSION_FMT defines and add sysfs newlines
Date: Thu, 20 May 2021 15:58:38 -0700 [thread overview]
Message-ID: <20210520225838.GH2968078@roeck-us.net> (raw)
In-Reply-To: <20210520072918.76482-1-juergh@canonical.com>
On Thu, May 20, 2021 at 09:29:18AM +0200, Juerg Haefliger wrote:
> 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: Joe Perches <joe@perches.com>
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
>
> Depends on: https://lore.kernel.org/lkml/20210511061812.480172-1-juergh@canonical.com/
>
> drivers/watchdog/ziirave_wdt.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c
> index 6c9414d09684..c5a9b820d43a 100644
> --- a/drivers/watchdog/ziirave_wdt.c
> +++ b/drivers/watchdog/ziirave_wdt.c
> @@ -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_RESET_PROCESSOR_MAGIC 1
>
> -#define ZIIRAVE_FW_VERSION_FMT "02.%02u.%02u"
> -#define ZIIRAVE_BL_VERSION_FMT "01.%02u.%02u"
> -
> struct ziirave_wdt_rev {
> unsigned char major;
> unsigned char minor;
> @@ -445,7 +442,7 @@ static ssize_t ziirave_wdt_sysfs_show_firm(struct device *dev,
> if (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.minor);
>
> @@ -469,7 +466,7 @@ static ssize_t ziirave_wdt_sysfs_show_boot(struct device *dev,
> if (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.minor);
>
> @@ -493,7 +490,7 @@ static ssize_t ziirave_wdt_sysfs_show_reason(struct device *dev,
> if (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);
>
> @@ -538,7 +535,7 @@ static ssize_t ziirave_wdt_sysfs_store_firm(struct device *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);
>
> /* Restore the watchdog timeout */
> @@ -679,7 +676,7 @@ static int ziirave_wdt_probe(struct i2c_client *client,
> }
>
> 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);
>
> ret = ziirave_wdt_revision(client, &w_priv->bootloader_rev,
> @@ -690,7 +687,7 @@ static int ziirave_wdt_probe(struct i2c_client *client,
> }
>
> 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->reset_reason = i2c_smbus_read_byte_data(client,
> --
> 2.27.0
>
prev parent reply other threads:[~2021-05-20 22:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-20 7:29 [PATCH] watchdog: ziirave_wdt: Remove VERSION_FMT defines and add sysfs newlines Juerg Haefliger
2021-05-20 22:58 ` Guenter Roeck [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210520225838.GH2968078@roeck-us.net \
--to=linux@roeck-us.net \
--cc=joe@perches.com \
--cc=juerg.haefliger@canonical.com \
--cc=juergh@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox