From patchwork Wed Aug 5 19:14:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1341383 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=85.214.62.61; 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=U+J78rzy; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4BMLsW2Ll5z9sR4 for ; Thu, 6 Aug 2020 05:14:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 187FE82196; Wed, 5 Aug 2020 21:14:27 +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="U+J78rzy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 490C882176; Wed, 5 Aug 2020 21:14:25 +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 autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) (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 93A9E81F2D for ; Wed, 5 Aug 2020 21:14:22 +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-qt1-x842.google.com with SMTP id d27so34517250qtg.4 for ; Wed, 05 Aug 2020 12:14:22 -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=Nb+cOD96CKw+Nhb/+KOHb2Uu0Dyw4QXqFnzyS0kJVfw=; b=U+J78rzy4be6oJ06RRGo/l5W793M8uT9WJC/lja93pHtLFwl34IISYSS2ZVmLPsYfr 20wtBfZEHDK9oAULKW2NGOSp8v5FnQn4WzoaTGJ8e5ZOlSaeSzdsRVnBPdCbJeCg3uO/ uMJJK7vwxUc6WqSw/vBSVrfZQNvCj2m/p4Ezhtgj142gJ+1QvpHj+w0Nknb6SHcNO1Dx PhTgTToY0VTnxbKxo7CGWNLTwus5AuDp+O4juWnjJto4vZhIuBNV4aAY02LuymzP8uMP oKGcBZkr878KpjPYKciUInvYUh84J9c5AQtKZXm8hkvYJXmmH9QVGPQWxTsv9gMCTMjY b32Q== 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=Nb+cOD96CKw+Nhb/+KOHb2Uu0Dyw4QXqFnzyS0kJVfw=; b=cAMNcyLFLzgoeeWZi15BHlkQbVmMH1I0NJ808nvKX6XOcPBmcF67QyR2EkDTeN9yKA JApU44MKX9EULDcSxLI2vXxhOQF5XJmhJFJc1I7FPgaMNdTIWw2tm04MPG/Q8a6tpskM LbT9UZO/GgARkSVARQRZUs+0kRb8Ej2nTrfHpWb0nKdGJgP5k5CIDZxkDZ0ZcaetqQdC IdTSkNWZN7dffHpD2jGOZTgmVtBdXjVrCZem5Jf6jpnXUKEcxRCCHjO9nEsbLFBzlYQK IdpyqcyCyNigS27EEaIjAok+v2jqzbzjy+5aGqW08PKb7ltzaQ2TbKmZ8rghKXQ0aZX5 xIhA== X-Gm-Message-State: AOAM53200Fy4uyaSR+SyxYsHcRKNcXzKAPSkmKZllrGkKhpZPTqsaIHW UWAyiCCiBqznq/r7gZgIu/NuZdoJQvc= X-Google-Smtp-Source: ABdhPJzKL7jRi7ErX9cpAz6ByQlWVWa6hf4n8Miap6tswfmyu4y1FbUe8OUyeGsQ0JVdl83DnqZuBQ== X-Received: by 2002:ac8:67da:: with SMTP id r26mr4916537qtp.332.1596654861218; Wed, 05 Aug 2020 12:14:21 -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 k11sm2161563qkk.93.2020.08.05.12.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2020 12:14:20 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Marek Vasut , Simon Glass , Bin Meng , Jagan Teki , Sean Anderson Subject: [PATCH 2/7] wdt: dw: Switch to if(CONFIG()) instead of using #if Date: Wed, 5 Aug 2020 15:14:08 -0400 Message-Id: <20200805191414.146609-2-seanga2@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200805191414.146609-1-seanga2@gmail.com> References: <20200805191414.146609-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 --- 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 5684acefd2..1d46382f67 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);