From patchwork Wed Sep 9 21:04:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1361064 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=S8Mp1XHc; 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 4Bmvfb1xfBz9sTH for ; Thu, 10 Sep 2020 07:04:55 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C5583822E8; Wed, 9 Sep 2020 23:04:36 +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="S8Mp1XHc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1DE04822C3; Wed, 9 Sep 2020 23:04:33 +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-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) (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 EA8B2821ED for ; Wed, 9 Sep 2020 23:04:29 +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-x742.google.com with SMTP id g72so3876399qke.8 for ; Wed, 09 Sep 2020 14:04:29 -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=S8Mp1XHcieR2Yrz5uhyuYn3yS62W1R1omgltj08m+vXRyBnGzmYTOZwBSr+TJUnftN Mywq+MHf3Ou+8rdtablpukHRXWy/Z7X5675hbJ9QtsG+qQ5KBwAWes7PN1vD6icC0Lg+ 56PM7/VEv4Vr1uWHDG3W0LlUslFQuFPZCkglVkgb9DPnS80XnmBBaj1gYlhFlIqdRyp5 dfxvKz13hDvwK64KMXqHgJOJwHf3huobMMQ46U0q0PpaVJn9Pf2IlbGKk4xrwJTAaZRb Fnwl0n/UDb04GTPJc8Ng9axk1+GNzpiM7AMgB4jutGBwqjgFZpnyzhyyVSxNfjyUYAYp pLOQ== 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=Wibc7JOdhVUxkqPxDUTWrlwymcBKXYxJR3iIGFP/oSU/ffaLepp4Hcvj9cPkWGBiel GhQLnvQSaBZfLG6uSWG3Q9HfUlzanjhlD8xhmDpFLtcUFO6bl8eUyryoNhhfgwgJjrYT tmexNH0ZfbXfhXXpvlvQ7k+Nr0f5VbEg2nJ7nbVvTy6AnXlxRpRnPFsVwVynQd/Dt5N8 mS8WgTMcccLpk5bwaQRwHzcEdo8lsHblzozggy2PKcJV0V++Aj4VQIRmYmk4K8sObgq3 6NxKlrIRYZ3FpV1BQfsrk1hie3UhDGUFOkZDFILlyuoeRRaBQEhnjpyYnEJQV4n+J+9q yiGA== X-Gm-Message-State: AOAM532wrcwpSO56y43NSkYS2SWwGh5sx7bvWu2s+2CzouO73TBY233U W2B2e3r3GeoIfOSX5JHkVekqUyWwQHc5H/IN X-Google-Smtp-Source: ABdhPJx/zypjZZIRiQM5M7TdqyqdcBVjB9xZTEOapGsozpIOo0ChVGYl3lyQcrbmON1h/Yw99jRCxQ== X-Received: by 2002:a05:620a:40d0:: with SMTP id g16mr4920699qko.282.1599685468767; Wed, 09 Sep 2020 14:04:28 -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 c40sm4664096qtb.72.2020.09.09.14.04.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 14:04:28 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Bin Meng , Marek Vasut , Jagan Teki , Simon Glass , Heinrich Schuchardt , Sean Anderson Subject: [PATCH v4 2/7] wdt: dw: Switch to if(CONFIG()) instead of using #if Date: Wed, 9 Sep 2020 17:04:15 -0400 Message-Id: <20200909210420.243190-3-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200909210420.243190-1-seanga2@gmail.com> References: <20200909210420.243190-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);