All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sean Anderson <seanga2@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH v5 2/6] wdt: dw: Switch to if(CONFIG()) instead of using #if
Date: Tue, 22 Dec 2020 18:58:59 -0500	[thread overview]
Message-ID: <20201222235903.131751-3-seanga2@gmail.com> (raw)
In-Reply-To: <20201222235903.131751-1-seanga2@gmail.com>

This is preferred over #if because the compiler can check syntax even if
the feature is disabled. This cannot be used for CONFIG_CLK because
CONFIG_DW_WDT_CLOCK_KHZ is not defined on all platforms.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---

(no changes since v1)

 drivers/watchdog/designware_wdt.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index c0f43785a9..41866fa01b 100644
--- a/drivers/watchdog/designware_wdt.c
+++ b/drivers/watchdog/designware_wdt.c
@@ -136,17 +136,17 @@ static int designware_wdt_probe(struct udevice *dev)
 	priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ;
 #endif
 
-#if CONFIG_IS_ENABLED(DM_RESET)
-	struct reset_ctl_bulk resets;
+	if (CONFIG_IS_ENABLED(DM_RESET)) {
+		struct reset_ctl_bulk resets;
 
-	ret = reset_get_bulk(dev, &resets);
-	if (ret)
-		return ret;
+		ret = reset_get_bulk(dev, &resets);
+		if (ret)
+			return ret;
 
-	ret = reset_deassert_bulk(&resets);
-	if (ret)
-		return ret;
-#endif
+		ret = reset_deassert_bulk(&resets);
+		if (ret)
+			return ret;
+	}
 
 	/* reset to disable the watchdog */
 	return designware_wdt_stop(dev);
-- 
2.29.2

  parent reply	other threads:[~2020-12-22 23:58 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-22 23:58 [PATCH v5 0/6] wdt: Add support for watchdogs on Kendryte K210 Sean Anderson
2020-12-22 23:58 ` [PATCH v5 1/6] wdt: dw: Switch to using fls for log2 Sean Anderson
2020-12-22 23:58 ` Sean Anderson [this message]
2020-12-22 23:59 ` [PATCH v5 3/6] wdt: dw: Enable the clock before using it Sean Anderson
2020-12-22 23:59 ` [PATCH v5 4/6] wdt: dw: Free the clock on error Sean Anderson
2020-12-22 23:59 ` [PATCH v5 5/6] riscv: Add watchdog bindings for the k210 Sean Anderson
2020-12-22 23:59 ` [PATCH v5 6/6] riscv: Enable watchdog " Sean Anderson
2021-03-03 11:08   ` Leo Liang
2021-01-13  6:13 ` [PATCH v5 0/6] wdt: Add support for watchdogs on Kendryte K210 Sean Anderson

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=20201222235903.131751-3-seanga2@gmail.com \
    --to=seanga2@gmail.com \
    --cc=u-boot@lists.denx.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.