From patchwork Tue Sep 1 20:07:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1355340 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ohcRi6ZC; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BgynT2V0Pz9sTR for ; Wed, 2 Sep 2020 06:08:45 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0A21C822A7; Tue, 1 Sep 2020 22:08:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ohcRi6ZC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 18BCB808F1; Tue, 1 Sep 2020 22:08:19 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EBD48808F1 for ; Tue, 1 Sep 2020 22:08:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qk1-x741.google.com with SMTP id d20so2228565qka.5 for ; Tue, 01 Sep 2020 13:08:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cenf7uGWY+dDk2Jni9wC9YeD0xZiaCaFFu81rkZhx1g=; b=ohcRi6ZCRVDcMgQTmeep3qpxXbdVGPXj+UG8mNg4HOrn0Z3P9ez3u3i1Z4UEEP7q8P Do2pzw3fYxovMFAVStZp4XQXMdkabWi4jH1DIOmUser7s6sCkoY5hkaxc+h9AWnDz5zx AuDoUict/hcUHCpRilZes7wQMz95XStDxNhNGN4ZO8rQ7siAdhihh69cFDx0SpNjmFQW AxJ6UTfOArDLIVrIPbR4n4r5M/uGFGzed+VoCPw77IIee/NWGLAsaZiPnXgIR6DCg0Ez tSeFVCxy1OjrFgsPTUko2hFUsmUiNQV4gGGdK3zVh2RlwpcLw7r+fyC8EoAe85j8IcCg hWwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cenf7uGWY+dDk2Jni9wC9YeD0xZiaCaFFu81rkZhx1g=; b=CyxiJa1c/BTlHMl+342MP1RqHIWZ1x9Xb23b7yq7cio47SqNcmLtRTF4ErQRRpUpzb MdBdPtx63hzSzlA8XZ1nB5dQzWY0ZnZvpEv56UnaotilStD6k3NR2Rza2VRuJx/J3Fz1 d2umEYnqfWpTWUIDBYF67iFzjmYa/Kd1o68bAc7KDomjiLFtsLdx9qSL4+LEZAJrIw1G JJHcIvJgAK9Pp3fYPyUaBoxq8Zb+gDs3DWQkfJcsRQp1QmTFgeOwiT1vhj/CuyQFv/o0 L7xPUY/+9nbY+0wrFHU+ZfMOOD9VDZdkM3h0bNeBy1DdgwEbtlhFG8vksPSl7uhTbqDn EcvQ== X-Gm-Message-State: AOAM533xddC9iJyx8TZguS5U6W6dl+jN01KD8/SzFD/Mxd24LF6DXNTa 2UuhT4TcUEor//8QAUnzn6g1ZU1quEYTqcNU X-Google-Smtp-Source: ABdhPJx2YNeH28ZyDabZGiwj3C2DvXHYyw/N5IY8q+5FjP6DFGz5qTUhjp1JIjcOfJO1XQXkAr949w== X-Received: by 2002:ae9:c015:: with SMTP id u21mr3850582qkk.268.1598990894663; Tue, 01 Sep 2020 13:08:14 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id y24sm2545039qtv.71.2020.09.01.13.08.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 13:08:14 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Bin Meng , Heinrich Schuchardt , Jagan Teki , Simon Glass , Marek Vasut , Sean Anderson Subject: [PATCH v3 2/7] wdt: dw: Switch to if(CONFIG()) instead of using #if Date: Tue, 1 Sep 2020 16:07:53 -0400 Message-Id: <20200901200758.543851-3-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200901200758.543851-1-seanga2@gmail.com> References: <20200901200758.543851-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean 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 Reviewed-by: Heinrich Schuchardt --- (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 f25c8d9ab3..49cf861d46 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);