From patchwork Fri Aug 16 15:09:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13766492 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3E09BC3DA4A for ; Fri, 16 Aug 2024 15:10:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=kk006x1lSGgPVkf1N7wD/490C6uhzyHz0WF4+fDguIk=; b=mNbgf1wO4rgiAi 8nZHeGgSoZNqQZliut9UgKWsu4qqT+q85O07COovp+GD7sSjdqNdFCyBHP1VYCps6nrLoHK/h62to 5CJxZ1LxP8WwVQAWk1+t5CcNhxAXJGDicDXjNwPHemFgvWAjMUlqvkl1ir9C+uZqzrXYmM+zjJVEK e6/tFwy5Ii7u6Dwp0AFct4mAjXMA1K7YlOmBLkNO5M/pm4m7dzQ5xVvuaVL0TSiwV404RZOVTrY5W m240zhNgVKF6bax1pAEHnsXGFEL7YpdMcnH+YDATqaIgAO8fsaJq1Z5jep8kTvhuCgSyfkoCVFGRb 2kvy3aesHA4xn9cQU57Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1seyb7-0000000DKN2-3R2A; Fri, 16 Aug 2024 15:10:37 +0000 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1seya9-0000000DK5d-2K8t for linux-riscv@lists.infradead.org; Fri, 16 Aug 2024 15:09:38 +0000 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-429c4a4c6a8so15556555e9.0 for ; Fri, 16 Aug 2024 08:09:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723820975; x=1724425775; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=q0sK0ufc7qEbd/mn2fdq4hcobz3MRQ2PN+HK1BuFHRw=; b=HwgTQNFTjjprQHEdW+d7wIFDTOP2IkgXFE6kvf5rk2JAbPulL9GaS858kmmfFS6k1A 0/C5sGC2wujv3H9qVpta5SrymbDckXXmQ0FVxMparxad1DgsdIyasJGmvLZlH4wFzzzV 9AYyy9bCELWmZvB7uAH3Cl02h0xuhc2tkwGIkKKBuBEBU459lbcCGcG6JEJqW1Iet5ne rjl0KoTk26FdqZU+JegTP/P7Nzmu2PlZbVAR5mymjirMVwxL1LYmfQj0FdghPuS7SjaT dBotEQIh0e1wnufmrXbAVtH0RPvBvdj+PSfiNQVgbSeuQkeHnroY6aoGedNHFHY6ukpA yLzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723820975; x=1724425775; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=q0sK0ufc7qEbd/mn2fdq4hcobz3MRQ2PN+HK1BuFHRw=; b=BU+1A01wxTbEiFoMDpHzjbMro6hFqv1DQ6B7Z2UTjDdSVrn9m9yGK6+UMuPPgeid+k hZsjURIQ2+SvPfaQ8MP4WDJJoFveintuGc1u/q3kR3BnGTcqYORpjBOC5uBaW29HlL+D 6uAxpqSjTioPRu133DkGzGc7atcHpFxE73JZoHXdGEvEjIT0Z/N45ByDjBel9YanJyyw rd6ffVdqCMyhFrklgRP9HWBtCrhJbtUNkCNZ6Kxm0UUMkSGMvYP4tzEfU5LhqqrFeWp3 dOF11R+sayWUKRQdF17vs75TprICFxuO+S+gcsJCOR07df76SSAr9KFvDoRF+QjVlt78 hsGA== X-Forwarded-Encrypted: i=1; AJvYcCVNjtIef+kO/jGCmNk+64VxNZdAalNINHAjMCwgsfG1RoN/nIHDsDVdt/YJw0L6gGTbV6jtXI1BVMY+igNbNncn4cLUANpW+dWh/Dd7aFT3 X-Gm-Message-State: AOJu0YzboDDK7rOHwvFT3bVqhYkgxfV2MMdZBY9SDPag3bFEbMAIjYwG JjHfV4eQCNk8KSrqgNr2rpNSyWFumxhNsHsmSDNB65CwYAuOd9iAyShGdWXQBvw= X-Google-Smtp-Source: AGHT+IFhP/NIsW9PWfnEcWLqi7chpg87KWhwfD8tKVYrnOj6sJddsAiBh6dq11WCBuqo717hp+HeUw== X-Received: by 2002:a05:600c:444b:b0:426:6320:7ddf with SMTP id 5b1f17b1804b1-429ed7f944bmr19485875e9.35.1723820975298; Fri, 16 Aug 2024 08:09:35 -0700 (PDT) Received: from krzk-bin.. ([178.197.215.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3718984993fsm3808758f8f.31.2024.08.16.08.09.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 08:09:34 -0700 (PDT) From: Krzysztof Kozlowski To: Ulf Hansson , "Rafael J. Wysocki" , Daniel Lezcano , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/4] cpuidle: psci: Simplify with scoped for each OF child loop Date: Fri, 16 Aug 2024 17:09:28 +0200 Message-ID: <20240816150931.142208-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240816_080937_598547_302DCBC6 X-CRM114-Status: GOOD ( 12.78 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Use scoped for_each_child_of_node_scoped() when iterating over device nodes to make code a bit simpler. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Jonathan Cameron --- drivers/cpuidle/cpuidle-psci-domain.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/cpuidle/cpuidle-psci-domain.c b/drivers/cpuidle/cpuidle-psci-domain.c index ea28b73ef3fb..146f97068022 100644 --- a/drivers/cpuidle/cpuidle-psci-domain.c +++ b/drivers/cpuidle/cpuidle-psci-domain.c @@ -142,7 +142,6 @@ static const struct of_device_id psci_of_match[] = { static int psci_cpuidle_domain_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; - struct device_node *node; bool use_osi = psci_has_osi_support(); int ret = 0, pd_count = 0; @@ -153,15 +152,13 @@ static int psci_cpuidle_domain_probe(struct platform_device *pdev) * Parse child nodes for the "#power-domain-cells" property and * initialize a genpd/genpd-of-provider pair when it's found. */ - for_each_child_of_node(np, node) { + for_each_child_of_node_scoped(np, node) { if (!of_property_present(node, "#power-domain-cells")) continue; ret = psci_pd_init(node, use_osi); - if (ret) { - of_node_put(node); + if (ret) goto exit; - } pd_count++; } From patchwork Fri Aug 16 15:09:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13766491 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 87CCCC531DC for ; Fri, 16 Aug 2024 15:10:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5TAQM0hW2bNBkD2lgk22e75OdHulXzNEOe5pXvipUww=; b=dEkole2398fw0b 5uovGvUSPP9U9O1jAoIaFyMMFcLNpLJkFes5XgxFHIAfRdRiqhAFwGEJJtd18r4lM3BPF4wFs0wIV mPtnko8iq+m40JAn13JAX9M3GdUOfj/7pIWGzVk18/HINLnVTq/Q3jQA/rhKQZ4bSB5k94IHg5sE3 75ZKPaHPbS4HK4tbq3diblGrgT/K81X0Nq8tXAmI4sDND8nR2cd1/zPa3UtpSFqHPxn/VW/Snwcq7 fdCrgaEVRD1VwsVubhyxny+A7ng93KX5QSY81/hKfF/w+FZIQOwacq4EgrnaPZiH/tFWIV6DCMyC4 agTnnInGHA5nm9mquAAA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1seyb8-0000000DKND-2PVm; Fri, 16 Aug 2024 15:10:38 +0000 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1seyaA-0000000DK5s-3dmT for linux-riscv@lists.infradead.org; Fri, 16 Aug 2024 15:09:40 +0000 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-428243f928cso15258495e9.3 for ; Fri, 16 Aug 2024 08:09:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723820977; x=1724425777; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ycsrSNVghYJYo7Kq/sAqp6MnjeFyaL9nJFuFS/dh9Nk=; b=xyvCllSfHZolJ6UK7A0KEJHusyFJaiyglwNdTbFk1xr6z80ASDmPs4GC5Z//AQnfta PYEw/qwjPXC5oA9OgtlifHQZGFC+iOpwVUqKWm61TdtXpb7p49ko4EIxbQof16npGE7b mcKOG42OVnHbYv/R8GDorfMvbSHhjpliimkGd3NWImhvOaSrV/0xPUxbOatfdpmAAbCK mlOc3khO0B/SILf0fmr1SyXZPIi4Y0FTaB86XG0onH525Mbs1aUAKWwX29JXEoUPBmy+ 9TgLjneT25fhcb6b/VNYnlliBELTgAO/SLCMLKawKU+XZgeAlgKhQW3qoORopRaczcLv xdaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723820977; x=1724425777; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ycsrSNVghYJYo7Kq/sAqp6MnjeFyaL9nJFuFS/dh9Nk=; b=jMnNPZJpgpmKh0Ez1YOgVyZ/TEhY+D9BK5rCmKrbwPJf5I3KeSAM669Je8vHrYawWW cvfq+IuFExZpCGTToYNJcmgRCAFjRhmz1YDGjrypxmGHSDOJDEKQZ31qrTYh2L5k20UB KcSj4xP41MrNEy35ybG2Uvb/DX9emA0AEAhnIBFfZXxyVPfcfsvpdlwba4TZ7wD0tI5y RNSQixMk2OY1YTSpAF8kaO7mzFu/AE0blPyz7ABGwT0+hT4KzaF7EYtHm+3oIdVvebe7 OZYWBnFKeA6P/wGYfUfjskAiWg07LPgmqs5MUv4a1Sf3BJsPvA8oJTHf8tTLq2orBgSb eZTw== X-Forwarded-Encrypted: i=1; AJvYcCXLsTt/qmfU+PtinjNqJWaG4bXl1WjlLg2r/JYvDW+B2tleDG5ezxW+OTQ/YA0Lf0uziknprULZEVlu3VscdMeUvOCOiT7YFJ5GnJucQU9l X-Gm-Message-State: AOJu0YwfLBpHt+PXDLcb7McKD8atH5/LlSExLNCgnwk/v1WcSJcMSbrG gN+qcFxw7t/XsAztl19/nM4JpUF90GKVS9d1X3zpXGxAVDz63K2u6sss9E4i6Z8= X-Google-Smtp-Source: AGHT+IFDGX+GfHixPCgcFALGkNattnCz9fLq1GjkO92ZX/36nvryecE+9MvCeLg53L+RFEWex0FMuw== X-Received: by 2002:a5d:5442:0:b0:371:8c79:73c1 with SMTP id ffacd0b85a97d-37194317aa2mr2276336f8f.2.1723820976767; Fri, 16 Aug 2024 08:09:36 -0700 (PDT) Received: from krzk-bin.. ([178.197.215.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3718984993fsm3808758f8f.31.2024.08.16.08.09.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 08:09:36 -0700 (PDT) From: Krzysztof Kozlowski To: Ulf Hansson , "Rafael J. Wysocki" , Daniel Lezcano , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH 2/4] cpuidle: riscv-sbi: Use scoped device node handling to simplify error paths Date: Fri, 16 Aug 2024 17:09:29 +0200 Message-ID: <20240816150931.142208-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240816150931.142208-1-krzysztof.kozlowski@linaro.org> References: <20240816150931.142208-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240816_080938_942694_3A386DDB X-CRM114-Status: GOOD ( 14.33 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Obtain the device node reference with scoped/cleanup.h to reduce error handling and make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski --- drivers/cpuidle/cpuidle-riscv-sbi.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c index a6e123dfe394..5bb3401220d2 100644 --- a/drivers/cpuidle/cpuidle-riscv-sbi.c +++ b/drivers/cpuidle/cpuidle-riscv-sbi.c @@ -8,6 +8,7 @@ #define pr_fmt(fmt) "cpuidle-riscv-sbi: " fmt +#include #include #include #include @@ -236,19 +237,16 @@ static int sbi_cpuidle_dt_init_states(struct device *dev, { struct sbi_cpuidle_data *data = per_cpu_ptr(&sbi_cpuidle_data, cpu); struct device_node *state_node; - struct device_node *cpu_node; u32 *states; int i, ret; - cpu_node = of_cpu_device_node_get(cpu); + struct device_node *cpu_node __free(device_node) = of_cpu_device_node_get(cpu); if (!cpu_node) return -ENODEV; states = devm_kcalloc(dev, state_count, sizeof(*states), GFP_KERNEL); - if (!states) { - ret = -ENOMEM; - goto fail; - } + if (!states) + return -ENOMEM; /* Parse SBI specific details from state DT nodes */ for (i = 1; i < state_count; i++) { @@ -264,10 +262,8 @@ static int sbi_cpuidle_dt_init_states(struct device *dev, pr_debug("sbi-state %#x index %d\n", states[i], i); } - if (i != state_count) { - ret = -ENODEV; - goto fail; - } + if (i != state_count) + return -ENODEV; /* Initialize optional data, used for the hierarchical topology. */ ret = sbi_dt_cpu_init_topology(drv, data, state_count, cpu); @@ -277,10 +273,7 @@ static int sbi_cpuidle_dt_init_states(struct device *dev, /* Store states in the per-cpu struct. */ data->states = states; -fail: - of_node_put(cpu_node); - - return ret; + return 0; } static void sbi_cpuidle_deinit_cpu(int cpu) From patchwork Fri Aug 16 15:09:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13766496 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CAE08C3DA4A for ; Fri, 16 Aug 2024 15:11:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=A+VMRg3cXIV9aFBDJc85rTWaMDgityMDS19W/OcHaoU=; b=K7NlDO4Tqv3vP3 LvUDuDgLiEDqaUu5fSVhurY+tphDQJ5+BQtkXI07GtrvLCF+2Lk6ZCdAl5rwPZzH1Hb1760J6Nl1l I2IvgHFxKUNSEpODPP0iZwkdZTnKKf21FBHQPur60urryDXdz930KxuOU5z/zinScf/z6ddWKiGgm AvIjQgphfmpcOAPqek6HX08sTMNSu8XNBRi1TupFove77Bdu3JodRKNC0kxEQrPf3lyff0czR5Hlv dQ+JL5a8Kh5vV3alDifJLDZszv7l42ktuTs+5+up3d3Eq/DAsh6ofkgHJTeRs49u0DEyRmkQS1Zof GLoTMquLNQWLN5MPhcqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1seycO-0000000DKhy-12Kb; Fri, 16 Aug 2024 15:11:56 +0000 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1seyaC-0000000DK6m-3z8w for linux-riscv@lists.infradead.org; Fri, 16 Aug 2024 15:09:42 +0000 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-530e2287825so2092042e87.1 for ; Fri, 16 Aug 2024 08:09:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723820979; x=1724425779; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=td2rg5GyKlqce51WO+zvnPs34jMkYsAdv+WksjCyFsM=; b=bNfNsL9V2FrInMEeMggdtLpO9JhTYBrK4l80P+Jyiowx/byws7KmTXL7V5oNoeO0XR MjpcfiiVZO50ItZ0pEMChBPaKiYQx1PjBs3F3MZRJUIY2pS5Zg7VKnwZjBj1+6AJHGuE WjTbXiANasVieYb0RYT8mCK38FioT1UuC3B/pJ6aeiul7j93QzUhlLOxFKGgSatrIkob J3IjWs7xk/RZZ8DdONVR5Pb7ukEe2Jrg/hL52ANAmoHcZWCQG9D9KjlfxLmQ1aG4VD4C pkJGHN7pgiB5r5WRGHqoPTGekDG/Puy7dSnJc6jaGuUWP4n5l2FeQE996ngTBlMjeC1O lLzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723820979; x=1724425779; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=td2rg5GyKlqce51WO+zvnPs34jMkYsAdv+WksjCyFsM=; b=q7ZJ5igsyqW/OFR+PcV5flL1PsSvslS7ngNzogBNN95ENnDFpujliQlJelGkY8UIT+ j0K/tvM6mPVt6Rbj+BSK115lnD8RtFqiXJFvhB7Ngbg0Ysx/BB8vvMcgSZb4Uq5+voaj syA+/jrzPreWHHsnqQEuFL+CWVvm5iMbsHwBMYdw801twmTIkbGosLrpWr9tctQVx+8c VBrl84HV0cqXOuVnMst6as3MxClm7SocnEr2h8JeBd0prhe1BG++JlBpl+hBWn5N107J 3P0edctNOyRD5GuOnccSfphLYHL0V+Lc3FwPzi6lWShml29slNueZWBZVnyQntYGMkWY ZUdA== X-Forwarded-Encrypted: i=1; AJvYcCVidyBY4VuRN488gOb1U5mBYzKzsSgQOPFKInUpuYzIfgFvDL6frPBqQZ7N8B2mXv65wL5a8yJOXKT65tUaZXR0Qg4eyxdvkiaORjAH8pTZ X-Gm-Message-State: AOJu0Yy/cPMlKx2StDGU74QAVCisGXTVbtZ5f3Se42MRYHlslkGer97X G35if/HuFJkk37lT0wmLjRkY8pCpu9/eTmR5SBrJ07kNeLuQ+7uzfumlEoASs/I= X-Google-Smtp-Source: AGHT+IHaJrVe+YG7WrIsIhySz+TrI0z8q1N6+97MbyrpU5ReE7HuOkmva7Y8+xgV05N9m9+gUaX3EQ== X-Received: by 2002:a05:6512:10c2:b0:530:da95:b54c with SMTP id 2adb3069b0e04-5331c6acec2mr2537162e87.23.1723820978496; Fri, 16 Aug 2024 08:09:38 -0700 (PDT) Received: from krzk-bin.. ([178.197.215.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3718984993fsm3808758f8f.31.2024.08.16.08.09.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 08:09:37 -0700 (PDT) From: Krzysztof Kozlowski To: Ulf Hansson , "Rafael J. Wysocki" , Daniel Lezcano , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH 3/4] cpuidle: riscv-sbi: Simplify with scoped for each OF child loop Date: Fri, 16 Aug 2024 17:09:30 +0200 Message-ID: <20240816150931.142208-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240816150931.142208-1-krzysztof.kozlowski@linaro.org> References: <20240816150931.142208-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240816_080941_007227_28E081F8 X-CRM114-Status: GOOD ( 11.80 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Use scoped for_each_child_of_node_scoped() when iterating over device nodes to make code a bit simpler. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Jonathan Cameron --- drivers/cpuidle/cpuidle-riscv-sbi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c index 5bb3401220d2..d228b4d18d56 100644 --- a/drivers/cpuidle/cpuidle-riscv-sbi.c +++ b/drivers/cpuidle/cpuidle-riscv-sbi.c @@ -448,7 +448,6 @@ static void sbi_pd_remove(void) static int sbi_genpd_probe(struct device_node *np) { - struct device_node *node; int ret = 0, pd_count = 0; if (!np) @@ -458,13 +457,13 @@ static int sbi_genpd_probe(struct device_node *np) * Parse child nodes for the "#power-domain-cells" property and * initialize a genpd/genpd-of-provider pair when it's found. */ - for_each_child_of_node(np, node) { + for_each_child_of_node_scoped(np, node) { if (!of_property_present(node, "#power-domain-cells")) continue; ret = sbi_pd_init(node); if (ret) - goto put_node; + goto remove_pd; pd_count++; } @@ -480,8 +479,6 @@ static int sbi_genpd_probe(struct device_node *np) return 0; -put_node: - of_node_put(node); remove_pd: sbi_pd_remove(); pr_err("failed to create CPU PM domains ret=%d\n", ret); From patchwork Fri Aug 16 15:09:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13766497 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BD738C3DA4A for ; Fri, 16 Aug 2024 15:12:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0YIf0lRv0uK+4nelOG4fnSyqRb6vLVH7N4deayisDt4=; b=T6IeUUJt5uXK+P T8C44yq51OPCMUVYDMahQSVKcTgdTZYAAFoIPYzyaDBY9xONICVKehcvOlL3pfdkDlxCd4PkjrW6W Y4TzRo3pWiM6L23Tghfhbp7GBCsREcrvxtTbX7Z62eYWsisl4CK7fttr3ZTIUAU1SPi4U6dstJDLs haRsaeoA+BpI8q8ei2h3BfzWMco1LiLNbzIDIygaQA5DYgzSypi1kvJfKJwm9ALEvj7MakLpYPe5o z87xSVn0bcf9x9v3mbwpq0ebMe9ruuj4DOIYoycWUF4w/K3UYePKLlgYvQCqcbmUhS9ZprTN4SYaV tsxx4ijc8q3oGTzHV+rA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1seyd2-0000000DKtS-0x24; Fri, 16 Aug 2024 15:12:36 +0000 Received: from mail-lf1-f46.google.com ([209.85.167.46]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1seyaF-0000000DK7T-0Ei7 for linux-riscv@lists.infradead.org; Fri, 16 Aug 2024 15:09:44 +0000 Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-530e2548dfdso2410598e87.1 for ; Fri, 16 Aug 2024 08:09:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723820980; x=1724425780; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MbmbkUcCYIXjsRgrPS/3FHLQvhhOEq6OSnn8VLc5BA8=; b=mHRvDzTzdgmudZpBGlJEM/ParpBDycNuROUUUVExHq8L2jWios/oHcG9ysS2cICG7N HVKLd/aow6v7op0mdT8r5AeMOGmsNrD8XZoY5ZS7zOm5onLBr8JGi+IYrvLrU6Aslg2O Sle5dYCso2o9YJ+cjvuLF3pVslua6wJQZ8NO+pBf0X6ir7vdBbFFmtXpT/vy7prTgQY3 8Lh6ZGU8yoGEEVDZfoIEjsZ4D0pmGuQvDcx0z5mfNOnsPGHCMH2oOlSvSMJAzLJqCxH2 pNpvnOwDaVSROhWLkfP3lhDXgmR4xoKLb2HP16nrONcHp+Nu+nK+hZYPTFedNBUAR8MJ 0M4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723820980; x=1724425780; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MbmbkUcCYIXjsRgrPS/3FHLQvhhOEq6OSnn8VLc5BA8=; b=UArkpnNdiHl1RppxUbj5dd7v4G5uVFb62ccyoo6gBEasuZkkxoaU5Z4Reb6uyc8ld4 sN39NbXkSf8Gx6Df19LJvtf+dcJe8+O2BbFp21DBMsv3rca9zKHTX9FKtwVxt6w1i2wa CJWrlbU87aL/SbfRpuqkkaNysmBiAc6tdmgRL+UN2EBDchUIX75QhdU0GyO+0OjPvNTV M8J+1wd2S37ZVdxSPBF60QfoCYi+xZzNCJWH5M1ExsEEf36dLYj0LnCf8h9gZaT8p7aF 2dea3xMTWbi2ggWu4P4UtwBr8PXJJmR+rnJvfIKXdHDrjzyCrtCkpeWumkPZqZqESAR1 YSwA== X-Forwarded-Encrypted: i=1; AJvYcCVbxQC257v1mIh2L7joWap0URaypZeZ1KzXtxB0glaUTZEFuoQDJW96GMFS/oiyAzL/ySVtgkMM6I2wePr96WszFVeCnUPP7EbBDW1GP4vp X-Gm-Message-State: AOJu0YzptJlU5hzOsoFiCkvv9emtqSzmSg5OX2qB0xyNsdvOFdCIQhvp LLn7E2FD8vy+vXuZoELYWDJgHzLQVIS6zPk/rugUGynkSqkkmh9BI/nyJOUpk/E= X-Google-Smtp-Source: AGHT+IFmY/sEGKzTKMYSCVLBNr0cmG/bAj/lYGZIFzFIBymPr4dUDTzJ6fAp0qTNkGSzAxbZDMsqbw== X-Received: by 2002:a05:6512:239e:b0:52f:c0ee:3b5f with SMTP id 2adb3069b0e04-5331c691494mr2172309e87.10.1723820980087; Fri, 16 Aug 2024 08:09:40 -0700 (PDT) Received: from krzk-bin.. ([178.197.215.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3718984993fsm3808758f8f.31.2024.08.16.08.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 08:09:39 -0700 (PDT) From: Krzysztof Kozlowski To: Ulf Hansson , "Rafael J. Wysocki" , Daniel Lezcano , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH 4/4] cpuidle: dt_idle_genpd: Simplify with scoped for each OF child loop Date: Fri, 16 Aug 2024 17:09:31 +0200 Message-ID: <20240816150931.142208-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240816150931.142208-1-krzysztof.kozlowski@linaro.org> References: <20240816150931.142208-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240816_080943_105816_1A4645F5 X-CRM114-Status: UNSURE ( 9.71 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Use scoped for_each_child_of_node_scoped() when iterating over device nodes to make code a bit simpler. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Jonathan Cameron --- drivers/cpuidle/dt_idle_genpd.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/cpuidle/dt_idle_genpd.c b/drivers/cpuidle/dt_idle_genpd.c index 1af63c189039..203e9b754aea 100644 --- a/drivers/cpuidle/dt_idle_genpd.c +++ b/drivers/cpuidle/dt_idle_genpd.c @@ -130,11 +130,10 @@ struct generic_pm_domain *dt_idle_pd_alloc(struct device_node *np, int dt_idle_pd_init_topology(struct device_node *np) { - struct device_node *node; struct of_phandle_args child, parent; int ret; - for_each_child_of_node(np, node) { + for_each_child_of_node_scoped(np, node) { if (of_parse_phandle_with_args(node, "power-domains", "#power-domain-cells", 0, &parent)) continue; @@ -143,10 +142,8 @@ int dt_idle_pd_init_topology(struct device_node *np) child.args_count = 0; ret = of_genpd_add_subdomain(&parent, &child); of_node_put(parent.np); - if (ret) { - of_node_put(node); + if (ret) return ret; - } } return 0; @@ -154,11 +151,10 @@ int dt_idle_pd_init_topology(struct device_node *np) int dt_idle_pd_remove_topology(struct device_node *np) { - struct device_node *node; struct of_phandle_args child, parent; int ret; - for_each_child_of_node(np, node) { + for_each_child_of_node_scoped(np, node) { if (of_parse_phandle_with_args(node, "power-domains", "#power-domain-cells", 0, &parent)) continue; @@ -167,10 +163,8 @@ int dt_idle_pd_remove_topology(struct device_node *np) child.args_count = 0; ret = of_genpd_remove_subdomain(&parent, &child); of_node_put(parent.np); - if (ret) { - of_node_put(node); + if (ret) return ret; - } } return 0;