Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 527B8C19F2A for ; Thu, 4 Aug 2022 18:17:03 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5A9A084831; Thu, 4 Aug 2022 20:17:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.b="Fy/i1VMD"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="YoKoODVL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 05A628484B; Thu, 4 Aug 2022 20:17:00 +0200 (CEST) Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9CC028481F for ; Thu, 4 Aug 2022 20:16:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=msuchanek@suse.de Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id D2CE335051; Thu, 4 Aug 2022 18:15:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1659636938; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=40zKj9HwAsnK4/EiXNloXLN8dDURU02mXDHxNSR+AbA=; b=Fy/i1VMDktdAISGVQjWnu14FpWRzHLlE7jTViWsN8oYVB50cKjilYanKfHMrAqCj2wJJlt 3LRJ065/4oavSrKxgQQ5p902+0u/pHUYL4KJSw2sv944INjNH6+mzetg9Y+2o++oqcwUUy b3BTgNUKKZIj+i/RlDRIzWsnCL49yfw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1659636938; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=40zKj9HwAsnK4/EiXNloXLN8dDURU02mXDHxNSR+AbA=; b=YoKoODVLBtG6ds5pF4hyYMeE9blqZuoYAClV5Wm1v/D2DhEXp4Fs0l5LHBeXudJ4UsQlaq PagDZdtv63kx+bAw== Received: from naga.suse.cz (unknown [10.100.224.114]) by relay2.suse.de (Postfix) with ESMTP id 389242C141; Thu, 4 Aug 2022 18:15:38 +0000 (UTC) From: Michal Suchanek To: u-boot@lists.denx.de Cc: Michal Suchanek , Jaehoon Chung , Chris Morgan , Kever Yang Subject: [PATCH] power: pmic: rk8xx: Remove some ifdefs Date: Thu, 4 Aug 2022 20:15:34 +0200 Message-Id: <20220804181534.6927-1-msuchanek@suse.de> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean After adding the poweroff support there are some incorrectly nested ifdefs. Move the poweroff code outside of ifdef and convert it to if. Fixes: ad607512f5 ("power: pmic: rk8xx: Support sysreset shutdown method") Signed-off-by: Michal Suchanek --- drivers/power/pmic/rk8xx.c | 41 +++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c index 25ef621f8d..a239a18674 100644 --- a/drivers/power/pmic/rk8xx.c +++ b/drivers/power/pmic/rk8xx.c @@ -129,37 +129,34 @@ static int rk8xx_read(struct udevice *dev, uint reg, uint8_t *buff, int len) return 0; } -#if CONFIG_IS_ENABLED(PMIC_CHILDREN) static int rk8xx_bind(struct udevice *dev) { - ofnode regulators_node; - int children, ret; - - regulators_node = dev_read_subnode(dev, "regulators"); - if (!ofnode_valid(regulators_node)) { - debug("%s: %s regulators subnode not found!\n", __func__, - dev->name); - return -ENXIO; + if (CONFIG_IS_ENABLED(SYSRESET)) { + device_bind_driver(dev, "rk8xx_sysreset", + "rk8xx_sysreset", NULL); } - debug("%s: '%s' - found regulators subnode\n", __func__, dev->name); + if (CONFIG_IS_ENABLED(PMIC_CHILDREN)) { + ofnode regulators_node; + int children; - if (CONFIG_IS_ENABLED(SYSRESET)) { - ret = device_bind_driver_to_node(dev, "rk8xx_sysreset", - "rk8xx_sysreset", - dev_ofnode(dev), NULL); - if (ret) - return ret; - } + regulators_node = dev_read_subnode(dev, "regulators"); + if (!ofnode_valid(regulators_node)) { + debug("%s: %s regulators subnode not found!\n", __func__, + dev->name); + return -ENXIO; + } + + debug("%s: '%s' - found regulators subnode\n", __func__, dev->name); - children = pmic_bind_children(dev, regulators_node, pmic_children_info); - if (!children) - debug("%s: %s - no child found\n", __func__, dev->name); + children = pmic_bind_children(dev, regulators_node, pmic_children_info); + if (!children) + debug("%s: %s - no child found\n", __func__, dev->name); + } /* Always return success for this device */ return 0; } -#endif static int rk8xx_probe(struct udevice *dev) { @@ -269,9 +266,7 @@ U_BOOT_DRIVER(rockchip_rk805) = { .name = "rockchip_rk805", .id = UCLASS_PMIC, .of_match = rk8xx_ids, -#if CONFIG_IS_ENABLED(PMIC_CHILDREN) .bind = rk8xx_bind, -#endif .priv_auto = sizeof(struct rk8xx_priv), .probe = rk8xx_probe, .ops = &rk8xx_ops, -- 2.37.1