From nobody Fri Dec 19 16:19:56 2025 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8F7C213D625 for ; Sun, 25 Aug 2024 14:14:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724595277; cv=none; b=W8nY2P+l1FjyMxHqTg+BjKr2tzhG8xx+o+2TlTRIdOLgw7+mqBxYOa6UrMe5IJ0x1C/q8TCoJxiypKTzFmrXs9furkO2VfaoNFclSVciGZZUBPmpizEAnOO2DYWpsFiiGs2JXAazY1YX1o9gjgsHAyePNiUkcBnt49MAjzq6g3o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724595277; c=relaxed/simple; bh=joVnS8DmY0g4Y+2gErHi2Nv91aaUMO657tgyX7t8ZFA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=F2gZqjeTQrsLfBadNq9kTMWNCo81IQ+o85ymwnC30paX9v5nuSiUoicHtak97nw4xOB/DTRYWcRYEHALb8X9hd5d/NMYWUDXgu4CCiPtj2xEeuCUBELlC7cP+6VmQSKwpHCCSZpogFhwsHkrsqWuutH0ZYy8ybYFHkknQ1STyqI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=PltZezpS; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="PltZezpS" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4280ef642fbso4330305e9.1 for ; Sun, 25 Aug 2024 07:14:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724595274; x=1725200074; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=3V39aJFJWv5Ox+8nMTcg04luiBvVyWT65eor5O85K80=; b=PltZezpSb1SdUjA3B/jtGKfWQ1q8sErWwsqu3hbdQ0Zv6T+0r6ePRVBLoUdv83sVd+ HqzTUGbAthNmOASZBiwpC1Yk0JDuY+Y/R7P+ds3gzBxguW9UFAEYp5PPuwTSVWe/WYMC raZ1OH+6qXstLrZsPX5EEOrrw7WiXt63FWzlKRfg5DHdwGHFIJ5q7dMZx9beFBKTIxSr uKqiCYsrmqO/QdKPryPjXLLn9tF5e9/3xxmNqUK63IfucS5SnIl4HOSZ3Vvtfp0zGTn7 JnTXCyCLzayKUwjgkdpXSRuGGon2hn5D/U2tJCiyxac8ZUIwB1+Damgyb/G9WdF66R4w gq9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724595274; x=1725200074; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3V39aJFJWv5Ox+8nMTcg04luiBvVyWT65eor5O85K80=; b=Fofk3vftFEX5/M7oFeXbGd70HJPsXf4sjR+ESriUAvVQpUb//JwXofscPKylXe+HPy N+V52FJbj9hn0A1AHJIabCtrzElReOaTa8Qb3xw6qYFsQIoFaMLzCZDng8xi1JMB2lSj JRBihTLvckhUg5FBatmZ7BTy5TQsEEwy1yjbghTaCuAV3wbprDoP8rp8iYU0HXfcq5Yh hfLKbyHmHdnnnkTR1bDoc4a/IQiN/pTD1HyHS/5yBLWtqbPJJZrLLM4GPOqCyiTzcjHQ gAwe8/14lWQEtPCEsmtK8mds/pDbPjpzMxeGai4Dr9dgUeM/QSiC3d/u7wz76OCm0UeT 6CqQ== X-Gm-Message-State: AOJu0YwqFMERaK/Cb9v8AEZ0Gp/8IMiTjXxm0LAae2bWGdrHXKPmmxNv benJgumfaYYPoSeWmwTHvusG/8vlaKtAn21Zr/CwMEClT7Hn2wDVYfZeZ1e1OsE= X-Google-Smtp-Source: AGHT+IGxaU5SPPeM8id8GkXJPuRmYySTf3YFVPhWqsLL0MARUSWhix2AIa7U5LEypfPKdiEqh4SA5A== X-Received: by 2002:a05:600c:3b8b:b0:426:67e0:3aa with SMTP id 5b1f17b1804b1-42acc8d50f1mr32658585e9.1.1724595273921; Sun, 25 Aug 2024 07:14:33 -0700 (PDT) Received: from [127.0.1.1] ([178.197.222.82]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42ac5162347sm122556045e9.23.2024.08.25.07.14.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 07:14:33 -0700 (PDT) From: Krzysztof Kozlowski Date: Sun, 25 Aug 2024 16:14:24 +0200 Subject: [PATCH 1/5] reset: berlin: fix OF node leak in probe() error path Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240825-reset-cleanup-scoped-v1-1-03f6d834f8c0@linaro.org> References: <20240825-reset-cleanup-scoped-v1-0-03f6d834f8c0@linaro.org> In-Reply-To: <20240825-reset-cleanup-scoped-v1-0-03f6d834f8c0@linaro.org> To: Philipp Zabel , Antoine Tenart , Sebastian Hesselbarth , Damien Le Moal , Palmer Dabbelt , Vladimir Zapolskiy Cc: linux-kernel@vger.kernel.org, Damien Le Moal , linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Krzysztof Kozlowski X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1147; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=joVnS8DmY0g4Y+2gErHi2Nv91aaUMO657tgyX7t8ZFA=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmyzxCjY77hkWpo20MJfyjjnVxsKR95SKAeU/iu Y3zJ4/suN+JAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZss8QgAKCRDBN2bmhouD 1/knD/9qX7o6/PZtVNH2lJW8W33eM3FNJFkdfkdS5NFkRnuq3XXEzDEAZLSSv6V/pWOYUEuiS0n OO6zl+0bae9XYGJi++SiuGPQBh8B6+5oRMSq2NNF+xcAkq18NJzU7HMi1wR2G6O9qauYQfvL+UD JR8TFFHdo+8DEObsVCOEA2ODYNY1+T4ABgXQqfOICeeQyWedx3g7BQ+Wn1ixGEQtvOjACRMjJ6H bKo3D7lFjZQ4sMrVTvkRv5UDVx82kBcS+g7QaTMefWaT6V4//kJojlV9rB3XmoOPSxHb1SEbdkr /+O5k2BFjG6wnjIwZhEKCBw5l25Y3IHD+ocwkt12CnOffinirDqQOiZ3yQlq2vQdLYxO9dT9hJl cysTeZ4B5BSfg2PpfjKB0ItoTeUldc2ZF+5CrO/8AgCxvyvumSAslG0SGGbpjeyX8bdx60Dxkxt iy843maH30+bYknaIMDKuY0lwb6p+fCtPR5/fnDhZp2j1wagrZmfZqux4PR3Cs8SUWAcyzH3/bR GwOdyZKbYs3Gqgt3kKrUdRs4rOpOhVHA2lsf846AVXufeF7FDtpYav5WtOTno+vngsU5cDeD1n7 FV0UCpBnyGd61GcPxxbr1VvPpn+WnqXlRmZ4eCApcxWKPsDCn1TdmUg9Ib0+TTu7rEZ9/BJMBpH xTPG14fHg7JSC/Q== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Driver is leaking OF node reference on memory allocation failure. Acquire the OF node reference after memory allocation to fix this and keep it simple. Fixes: aed6f3cadc86 ("reset: berlin: convert to a platform driver") Signed-off-by: Krzysztof Kozlowski Reviewed-by: Damien Le Moal --- drivers/reset/reset-berlin.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/reset/reset-berlin.c b/drivers/reset/reset-berlin.c index 2537ec05ecee..578fe867080c 100644 --- a/drivers/reset/reset-berlin.c +++ b/drivers/reset/reset-berlin.c @@ -68,13 +68,14 @@ static int berlin_reset_xlate(struct reset_controller_d= ev *rcdev, =20 static int berlin2_reset_probe(struct platform_device *pdev) { - struct device_node *parent_np =3D of_get_parent(pdev->dev.of_node); + struct device_node *parent_np; struct berlin_reset_priv *priv; =20 priv =3D devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; =20 + parent_np =3D of_get_parent(pdev->dev.of_node); priv->regmap =3D syscon_node_to_regmap(parent_np); of_node_put(parent_np); if (IS_ERR(priv->regmap)) --=20 2.43.0 From nobody Fri Dec 19 16:19:56 2025 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 17ACB155389 for ; Sun, 25 Aug 2024 14:14:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724595278; cv=none; b=VdUVjpP+rEi67iSRXVWbHf7vnHbH9Qz2uuaPXz2732XbnuFM5ZjJNr/GZ45Iu08DbQ8e4v/gXAl+Ywyj9fe5bGL7mt/raSG/Y/243mwQoRhDPuqntZ9q/C217Q0ygsDjIJR5MkcP/yiKcXIc9uToqwKvGcVd7CEvC9Cop3AEzaM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724595278; c=relaxed/simple; bh=9pgusit1pxrr+A2/sS7UfW0KAIyXH2HmTDW6oahLzho=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=b9FEIsMKANXTJwApsxKrdUVtkdnhzzB4N6G952YFOeMCvkMlp7e796Qq7y/H7JZtndZJEEIeaWNHvYLC00Sukq+jgiuwuw5Hrv6Yd8VSrggUp3hsnqHNz2adQ+RRPsgtb1uhMY52stGVeWqLUyLmk9pmgVBoSRS06DFnwxNWpDw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=jvEN3O7h; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="jvEN3O7h" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4281da2cdaeso5392075e9.2 for ; Sun, 25 Aug 2024 07:14:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724595275; x=1725200075; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=+vyI734cRrZFj0A/p/jgke1T1ninVILNTlfgxfQSwKE=; b=jvEN3O7hN2gt7KPXx59yqGeB7+Fd/0OckZx8LWBXp7/S3pzyTDVrryYhLZSlVQvLDD ld0ojYmh7rlPi/WQFFl/eadyQqbDnU4y8NIxh0KGNsHtdpGF7DIMrcY6/XjbEnMo4mCE JKklhcgD6x5smT6VZQWcZG8pGDrsHHXnQql/fV8m9s4drEtPvDuW8w6E3SZT30AF3TJp n2jbDaHJnBil/CjEs5eAq+W61PFxNkEHJ/47O0TnHyTn9EaeS4kNofqR9LrME6Y7NVoR tQb8cYJM12wrpeYltUM7s3HxRuHLtb50E2MBipBTdrI62Kw8v4EUJrEnZg/Q9awcWJh+ JBjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724595275; x=1725200075; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+vyI734cRrZFj0A/p/jgke1T1ninVILNTlfgxfQSwKE=; b=fPj4xeDKs0mwJnGQO4jbdwladS7pmsTh84Mu65C5/CQBIRgFrEvezzX+zA5Xl+USm/ P62mcrgN6FQoPOkGizXUivzDzUsFP3cAHUqWuBVuKjJMCgg8i1Bk6F+1huPQSD4lHD9D UJPXvLGpkVuLlStkNmFNNWEr4llNky05jNTZt3hHtZOFXWMVQ/diQRtZ0KIituGCMbA9 U8Lvl8oAorwdjGTEUQydfjAH/0/ZLsvNNn9GbBsDudofsDw+QSBnB6B9b5xvSjU6ZEKI MvyvTsODd6vSYsUD1P3EClAtAPSw5WJNfde3nqZyUopFwkKKdTc4aovjvt5Lx5hpKvKa ibpA== X-Gm-Message-State: AOJu0YwEG0LMcH1/Tl4ebMFu2NQN/oaLKO8WQgo3XWwfl8pRb2zUBFce +bYtKDM0phvAQ5k3vq4+4P6lXnDogOuAiYRC+rDNb5A6ho1Ya5q+777NvKmdzfI= X-Google-Smtp-Source: AGHT+IFak5e9TgxMwRV1VQC3TmD/nC7hYru8uGqId4jYQGfP92V0mB5tath7X71OxrZX1Y6HIUhsVA== X-Received: by 2002:a05:600c:1d25:b0:426:6ecc:e5c4 with SMTP id 5b1f17b1804b1-42acca0c727mr34083495e9.4.1724595275253; Sun, 25 Aug 2024 07:14:35 -0700 (PDT) Received: from [127.0.1.1] ([178.197.222.82]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42ac5162347sm122556045e9.23.2024.08.25.07.14.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 07:14:34 -0700 (PDT) From: Krzysztof Kozlowski Date: Sun, 25 Aug 2024 16:14:25 +0200 Subject: [PATCH 2/5] reset: k210: fix OF node leak in probe() error path Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240825-reset-cleanup-scoped-v1-2-03f6d834f8c0@linaro.org> References: <20240825-reset-cleanup-scoped-v1-0-03f6d834f8c0@linaro.org> In-Reply-To: <20240825-reset-cleanup-scoped-v1-0-03f6d834f8c0@linaro.org> To: Philipp Zabel , Antoine Tenart , Sebastian Hesselbarth , Damien Le Moal , Palmer Dabbelt , Vladimir Zapolskiy Cc: linux-kernel@vger.kernel.org, Damien Le Moal , linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Krzysztof Kozlowski X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1185; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=9pgusit1pxrr+A2/sS7UfW0KAIyXH2HmTDW6oahLzho=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmyzxD9ZG4S/H4bpvV+Ch6/rnPSqPk9mJsU/Jxb DPFQLvB6+KJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZss8QwAKCRDBN2bmhouD 19lyD/4x8fa4AOkKyveVLnoZhsiOq4/EM63MPkrJMxfB9Vfm/yTnK2uzctxkuWPgDgB076mY76k SaMnFfbFkK8VdlwXcAX/zFm0PBTyRXcbKk7Nv4u01b8rHPx9IAHCFOM8hIwGIa03i6XNmsL5Uko t42t2QmGdu6UFGT4kC9GKB5YbpDuZVYys8UZdPTYbwFScrCa3qRrMkZFZJZ8KP2YPGNtRR/F/Ua NqmT68ych37x5XciGnCF23o31YCm6nU5COwcDG6I/N7hWjqMt6f8ur/bRKEJeV/BJWFlK+Y2VHj 2zhkkrX7jC/eVXDm8L/zrU+aIn68h7lrDNgOtp53fekgqoPoQ6VXqmXGzYpChSl8atweHp1gDBr Q0/uc0DWw/Nheal0uryPSodVR2zQ1iqMoCxEPIa/wPHNqOcPOxjFC4OLs2tBViG6jaTrsWuRQBm zpVBbKkvEGSsf9sPZoNLWnyG6k9DnsXaaNoJPRC6EFXmpGJPnCIFAFW1BLmK02AWvLJ1IfZmIv6 Dem+z3xlw1HPDUIc1VjoTAXgLqUVqUFiSWXjd4jYqUtCtbvsNqp8+3iMCsvZAKJuK7RMKQGLwOs l3/2GQjQD7VfbOVodIn3WKUknAfKn67Gdhj0ML4V9Fk3gIyBj93OX8kSoSyTxq2vYb91N1LAfbb 6ZR51YIOEl0TDoA== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Driver is leaking OF node reference on memory allocation failure. Acquire the OF node reference after memory allocation to fix this and keep it simple. Fixes: 5a2308da9f60 ("riscv: Add Canaan Kendryte K210 reset controller") Signed-off-by: Krzysztof Kozlowski Reviewed-by: Damien Le Moal --- drivers/reset/reset-k210.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/reset/reset-k210.c b/drivers/reset/reset-k210.c index b62a2fd44e4e..e77e4cca377d 100644 --- a/drivers/reset/reset-k210.c +++ b/drivers/reset/reset-k210.c @@ -90,7 +90,7 @@ static const struct reset_control_ops k210_rst_ops =3D { static int k210_rst_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; - struct device_node *parent_np =3D of_get_parent(dev->of_node); + struct device_node *parent_np; struct k210_rst *ksr; =20 dev_info(dev, "K210 reset controller\n"); @@ -99,6 +99,7 @@ static int k210_rst_probe(struct platform_device *pdev) if (!ksr) return -ENOMEM; =20 + parent_np =3D of_get_parent(dev->of_node); ksr->map =3D syscon_node_to_regmap(parent_np); of_node_put(parent_np); if (IS_ERR(ksr->map)) --=20 2.43.0 From nobody Fri Dec 19 16:19:56 2025 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C7C1156678 for ; Sun, 25 Aug 2024 14:14:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724595279; cv=none; b=gU/nnRNAU3JzyYVMBC+H5v2eYyJUCqBb4Qp5MiJCuUpYJYOmJeG8+EzGhvc02Mh88Omzcwri6Hl9pgcIyP3T2Py/tI5ztIFy+egtplHTxIJYWNBHc0VRsfc70st0UntBeDm8/MJW/lMrmGGvX1UgRatpVxThHirsTtLOjeeBbF0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724595279; c=relaxed/simple; bh=Ytuccfgs9TsHyxm9hDxL6CEbdGnLEij+BN4ZXAevank=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=efqne5IRBugQtjQnFG8T1Xg+8/FVQr4l5/eHKMDcYDV21eR0I+EGq/FTUPnliVeiGLMi9wyN8T2EJ4eNV0FQKfYFEbv+034IylpamnGdWT8yW11MYYW62/KuyQRJ/P3rXeeuTsg0PImlzE7A+epe90/vFEM6QyUqez5o6vnS1yo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Dlkb3zKB; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Dlkb3zKB" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-4281da2cdaeso5392105e9.2 for ; Sun, 25 Aug 2024 07:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724595276; x=1725200076; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=RgnZ6ZqZdmNcLaioI4ubaYNngOpE05oWSti+DXvBHck=; b=Dlkb3zKBBcbp/+D+dRvRXUHmwi0bnJ/HLHulGWx/2K8xO9Y3c7ZVbR55Y43Jyza+U+ 4rxcdEHnIVnX1ARHCPIyXOwgmKRBlyezRbSoEZswycTde3bUlPb3v7s048Nd5GrkOtTn r+04Fqv/6tnUpkUFB7ovF0sBuyw2ywRCpFyK78uSBB+ueUsE2dwIcUcTNnACI08eqzcZ OpWYC8Z6IssBO105TBseCaFnGS47htQ/4SJAiJB9PSHr4e2gFf505LqoljyNE7VanfBu bdXJdSm9C8DaUIayhCgipxgrguKMKlOyvokHvHk7687xUsewYeKx2WeceKQa1Q9XD3No K0Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724595276; x=1725200076; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RgnZ6ZqZdmNcLaioI4ubaYNngOpE05oWSti+DXvBHck=; b=eDMa8/wBkGIre/tvAzEOix0S1mPTagMGDCmKKQAC5b3mHp1/FWs2TFRNBGsP5C4J3c t3/t8Aobg8ldtMA5fNvBbSeNK01DZVzQmHFw/TjDdkkyOQeiOC1ll/JmywVaX+Lerv+x T87hcSLqSuFZqYBhYba9ig0O8wsZThCrOTOL+u8DoY7ckjV06MDYF2kI+WHtRULpy0q8 BUWmmYR1pu3tTgO0kPN6rfpPCr84ImYW9zDXnPoElf4pr/JLX6A9A81+3Mdcpv2xRMc1 7oxBsCX+ZdSQyLTa4vQKDBQfrDvwUs2et1KlLyyqiQF+1MLAP9FjslVkJSqahO+paPia Yu/Q== X-Gm-Message-State: AOJu0YweAvcyorGWX6lI7K5mO4wKQJmtRSi5my8VDwiEtc5pwjPKSaFp l/QOn40a8rtAD2Z/lp/ebkLkPM9X948nEJ/TYEiWfymWKHnrW1ht9/ZN3UxT9hs= X-Google-Smtp-Source: AGHT+IFuxALm/fRk7IdAEl9tHnqRf3lkS/IQePpSj6npJhpr82rrpicyYF4ug/0SBMzTwrc8Ul4eLw== X-Received: by 2002:a05:600c:46d4:b0:424:8b08:26aa with SMTP id 5b1f17b1804b1-42acca01063mr34147235e9.3.1724595276499; Sun, 25 Aug 2024 07:14:36 -0700 (PDT) Received: from [127.0.1.1] ([178.197.222.82]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42ac5162347sm122556045e9.23.2024.08.25.07.14.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 07:14:36 -0700 (PDT) From: Krzysztof Kozlowski Date: Sun, 25 Aug 2024 16:14:26 +0200 Subject: [PATCH 3/5] reset: simplify locking with guard() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240825-reset-cleanup-scoped-v1-3-03f6d834f8c0@linaro.org> References: <20240825-reset-cleanup-scoped-v1-0-03f6d834f8c0@linaro.org> In-Reply-To: <20240825-reset-cleanup-scoped-v1-0-03f6d834f8c0@linaro.org> To: Philipp Zabel , Antoine Tenart , Sebastian Hesselbarth , Damien Le Moal , Palmer Dabbelt , Vladimir Zapolskiy Cc: linux-kernel@vger.kernel.org, Damien Le Moal , linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Krzysztof Kozlowski X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1684; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=Ytuccfgs9TsHyxm9hDxL6CEbdGnLEij+BN4ZXAevank=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmyzxEEiERshJp4P/O36tRaMG3GnkMMvYxJ9g39 bFAc2IS7BSJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZss8RAAKCRDBN2bmhouD 104EEACHYXj9r8WaYp2o9fRW7dCF85yE11j+zp1IjAWosumCqGUSVtaVcJW0o6mKFDOTGul1Wmo MGE7W1EzVXd2ZyZNNLAWa51uznABmwL5ZSkg+AyjwrZx1lfZXEzPZb+MKhf46k1xFZ9zoi0Onam AbtiaiV/t2b4em83210TuqxSqsc3eSpkq/AXPN82gw1cHeCNA2H46wvTQ8/rQnBB+nBvPwiaocj nmyC7d3OlrR/xjr7T1ulZN9Or0ze+vm1Y1EVBZ4j84sz/fwmxtFQBNmC6/81lInJ4OScRLCjQvp wlCsXhPQKhluGr0r2UOgtXk84h1kdik+M6u3yL5HNMK1QomVKwfFkFJaHe3UKbnedEJ1DhmJY6v /M1aagcB3QnKmvBfK4XUsgDMJldJs0jQgOxJp0dgd4oY4sK9hgojSs2m3lVpAe/YHT788A876/k C9gRgcuxs8Y2lK6ktL71UuVKnLQwHAOWimTwIDcp8rNJ6naGB5/iITiRkdBh1EC8VRiYrIK3CyS GXP0khpho7KVDnNld4Vu7c1kYdbGqm21HiJnuMCgPl/tX60dfG/NDMu0WxUNKYWnjz6Zd8OWvm4 viMP4fPY4NQ+9emd1ZPd+/JbZEcBj3++KrIc7DKp/Ylzn1+ckWQHIdd/1yATfUUliOQ/kShZjZ3 6L2Gi0ciWufsHyQ== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Simplify error handling (less gotos) over locks with guard(). Signed-off-by: Krzysztof Kozlowski Reviewed-by: Philipp Zabel --- drivers/reset/core.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/reset/core.c b/drivers/reset/core.c index dba74e857be6..c9074810306c 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -916,20 +916,18 @@ static int __reset_add_reset_gpio_device(const struct= of_phandle_args *args) */ lockdep_assert_not_held(&reset_list_mutex); =20 - mutex_lock(&reset_gpio_lookup_mutex); + guard(mutex)(&reset_gpio_lookup_mutex); =20 list_for_each_entry(rgpio_dev, &reset_gpio_lookup_list, list) { if (args->np =3D=3D rgpio_dev->of_args.np) { if (of_phandle_args_equal(args, &rgpio_dev->of_args)) - goto out; /* Already on the list, done */ + return 0; /* Already on the list, done */ } } =20 id =3D ida_alloc(&reset_gpio_ida, GFP_KERNEL); - if (id < 0) { - ret =3D id; - goto err_unlock; - } + if (id < 0) + return id; =20 /* Not freed on success, because it is persisent subsystem data. */ rgpio_dev =3D kzalloc(sizeof(*rgpio_dev), GFP_KERNEL); @@ -959,9 +957,6 @@ static int __reset_add_reset_gpio_device(const struct o= f_phandle_args *args) =20 list_add(&rgpio_dev->list, &reset_gpio_lookup_list); =20 -out: - mutex_unlock(&reset_gpio_lookup_mutex); - return 0; =20 err_put: @@ -970,8 +965,6 @@ static int __reset_add_reset_gpio_device(const struct o= f_phandle_args *args) kfree(rgpio_dev); err_ida_free: ida_free(&reset_gpio_ida, id); -err_unlock: - mutex_unlock(&reset_gpio_lookup_mutex); =20 return ret; } --=20 2.43.0 From nobody Fri Dec 19 16:19:56 2025 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDA4815B56E for ; Sun, 25 Aug 2024 14:14:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724595281; cv=none; b=uFhkVZYYjClSOzhY+F+UT6B24VOf5DNXhAuc3V2hNTqMi+H6kwHizDL3s7y+y2IIcx2s3Dz2JdfEkpWkuszRvepoPTUTi5jyDiTG66iB+XH/1Q/l0A8ILwvbtEcvHshGOWhIMbPoU6TMbp73pG9h2QIQgMIV4KNptUR4ddChBO4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724595281; c=relaxed/simple; bh=Y2ICy6i8eJmrbEAyf3hyy7lpPTY6kTvT6Il6a4okjDE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ryX22i6PFlVu1ulV3TqKBXFditPO2dOKpxBjCk4NclbSz4p7JoDNbzfanGWpxePIuth/Bny5SDlU+JbgDI2GWqPKCiJdrTkfR5sy3ftKNdVpmLSj/ImTl3d0iqHiZja6oEsfByI96uuWbxny9QFqpOp1VNQkojzLTJ2QOGeiPRQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=eww/IuEp; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="eww/IuEp" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-428e09ee91eso4317285e9.3 for ; Sun, 25 Aug 2024 07:14:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724595278; x=1725200078; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=LjmDAWPerVk/U3QbJF8rREKJaY7hIybSzXq0JV4YLzI=; b=eww/IuEp7BpQMYf1YilnRXxodzmQioe8oNFoRjtEP3j3IxX18JkEbaJNpMN7mOQmct Gngco0KCd+8uPONwFtPAp2m0ILX6LcBdHPmhMm9NPXfGuleDqEMKGOigEX541naylBvA SKp5BZNHDdNAtyNLk0RGuiWDeUjdSbGh3Fb0ul+FyK+XSZZ05u/lp/aYW4tQ8TN2DJb2 gKG4sjswB7HqWrbgJ4lkFS1LO/rLUnz+GqZSnH3KI4bSShayvcnXOjAVtmS83Yt4zGFJ 718h9YiCQmAGk1bw7iIEMFmQTZEGl5+lsKz/cdHXjUtmrumUCBLFhqwAoRFGdj+iA8gB ohIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724595278; x=1725200078; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LjmDAWPerVk/U3QbJF8rREKJaY7hIybSzXq0JV4YLzI=; b=LEGX8x5hQuGElol6gr0wZ2TDhex5jVQ8+qQEpI3gBzNPF7Ipdcr7yrLPPWqBvBKfrw 9r7VwoHT0IGOntMWt6C830rdxEJkaXq+jTeRXyn0ix1S7Prk9nTU7onvl+fGZsi0S7B/ HxSrOj3s/wkOsBH9Y2sgDHs14MWXoBugEy7G9I8rdkRd1Ut2HRgYJhIhpYhpaNXVgCkI 9NGoxa+HDaxkDLHccZn3Xa4TvL6LWcMs5y/3dttQJyv6OuS9yF81vkqRunZl9XKKMv2z Vr1QZbf14yVYNV1tRrm/kqH9yf0HUK66BSO5lr0Ei34YbTHXrXOGhPpIOmvQWPKB7Mzr c59g== X-Gm-Message-State: AOJu0Yy+5Jo7wGmN9l6tjOUmojaIeNIcq3oUYLYaKe58asf6QaBaqxvT am8umSsPDT3CvbFXF4NlhP5ybhl5uJSD+qJYAEFhCxGl+WLylgkw6/LBrzX/2y4= X-Google-Smtp-Source: AGHT+IH4oX5sMG/q4v+zj6KRXeT4WvXHszuUwi0hhOxdOeHlPtcZUnDMGObVsUyIcqEn+TKymiOIXQ== X-Received: by 2002:a05:600c:511a:b0:427:9f71:16bb with SMTP id 5b1f17b1804b1-42acca17489mr32308195e9.6.1724595278034; Sun, 25 Aug 2024 07:14:38 -0700 (PDT) Received: from [127.0.1.1] ([178.197.222.82]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42ac5162347sm122556045e9.23.2024.08.25.07.14.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 07:14:37 -0700 (PDT) From: Krzysztof Kozlowski Date: Sun, 25 Aug 2024 16:14:27 +0200 Subject: [PATCH 4/5] reset: lpc18xx: simplify with dev_err_probe() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240825-reset-cleanup-scoped-v1-4-03f6d834f8c0@linaro.org> References: <20240825-reset-cleanup-scoped-v1-0-03f6d834f8c0@linaro.org> In-Reply-To: <20240825-reset-cleanup-scoped-v1-0-03f6d834f8c0@linaro.org> To: Philipp Zabel , Antoine Tenart , Sebastian Hesselbarth , Damien Le Moal , Palmer Dabbelt , Vladimir Zapolskiy Cc: linux-kernel@vger.kernel.org, Damien Le Moal , linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Krzysztof Kozlowski X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1258; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=Y2ICy6i8eJmrbEAyf3hyy7lpPTY6kTvT6Il6a4okjDE=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmyzxFI6hGTgYTOceLNliLoQr+EYniA1tKa5FfQ hePW63+vNOJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZss8RQAKCRDBN2bmhouD 17zzEACJcEdPayjkZvjjh2zSab3uEfc5NqZ4zTN6mSFqJoL5NzpvECKDgVsGtZwP2ra2wuQgDbc B5dfhfLe3E+Y735zsz4tHVXpY+PxkNZC8GSEVyl2Ox48Jz0reWf17m199ANdf30Wx2GXs/VKvit S/2SwK7rwLXJIVYEWADM6VMNbyGQjVfM6H1fVzpkCwEFWyuofywykuRlPszFT7wWwAOYhiWd57d m3PZjW4FICPbwLWDnwidm1cWe3dkeZrg46zVHTgP4JOiZHTca6a016dcRh63UjzG6TtbgUsltCg eIfyqzmHVS3ncCxx7uayrxoMcFQdKEXk5DmpX5oYotPp54PF8v5wFDw4sXuDfghny98AMwrer0x h4y/OoviFaO/wVVPLGeyQIA8/LnYdCqaYN9B6axrS3Lb4I/5hEWi7vh24Sf8DfhfGysMBwNPfX8 XzUuRkxphPFewdQp0RF+EfNbrFYOCViaHdlcQFEOrz6PkIzUC8Z2yoQPCNPJgmS8K+Cu53oYSBL mqmyD0U+++0K4lJSG7D6spDq/ClqaWE+PwwzR43K5HU6oY8gPAJlmIroZ/wZy8OZVG9Kl+bPapY iGzqFEFYtnXXO/IY9yhxytGqXD6lKeruYOwmy6JWYrFLDvOxQz4o83ASiJm/a3MHFFMDxpzwTp1 2Ag8sVPJwTGJSaw== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Use dev_err_probe() to avoid dmesg flood on actual defer. This makes the code also simpler. Signed-off-by: Krzysztof Kozlowski Acked-by: Vladimir Zapolskiy Reviewed-by: Damien Le Moal Reviewed-by: Vladimir Zapolskiy --- drivers/reset/reset-lpc18xx.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/reset/reset-lpc18xx.c b/drivers/reset/reset-lpc18xx.c index 28fb85772b3e..e7896e3f1851 100644 --- a/drivers/reset/reset-lpc18xx.c +++ b/drivers/reset/reset-lpc18xx.c @@ -151,16 +151,14 @@ static int lpc18xx_rgu_probe(struct platform_device *= pdev) return PTR_ERR(rc->base); =20 rc->clk_reg =3D devm_clk_get(&pdev->dev, "reg"); - if (IS_ERR(rc->clk_reg)) { - dev_err(&pdev->dev, "reg clock not found\n"); - return PTR_ERR(rc->clk_reg); - } + if (IS_ERR(rc->clk_reg)) + return dev_err_probe(&pdev->dev, PTR_ERR(rc->clk_reg), + "reg clock not found\n"); =20 rc->clk_delay =3D devm_clk_get(&pdev->dev, "delay"); - if (IS_ERR(rc->clk_delay)) { - dev_err(&pdev->dev, "delay clock not found\n"); - return PTR_ERR(rc->clk_delay); - } + if (IS_ERR(rc->clk_delay)) + return dev_err_probe(&pdev->dev, PTR_ERR(rc->clk_delay), + "delay clock not found\n"); =20 ret =3D clk_prepare_enable(rc->clk_reg); if (ret) { --=20 2.43.0 From nobody Fri Dec 19 16:19:56 2025 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 46B0816EBF6 for ; Sun, 25 Aug 2024 14:14:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724595282; cv=none; b=TTlOsJjWpq2SQvkrNrAB1LAzICOq2E9Azd9xQ4wAb2RED+RYSINSIvwHacSBMlRHVaIPgNEu59ZsHrWvihr1nFT7/3BVO1wIeirzK4wATWjfSDHRh+lKnQSoCn9mP3IMoJ+HaHmkGTkb+e1UzmFGLA1JOvZExsEU7zN3Wdtj22k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724595282; c=relaxed/simple; bh=3FUpFc5Q6VFd1fQ8A/U87QLsFQnyhnFox4YWGWQ0Hbk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XmHCFMbyRejIySdNW49buGT3qgP7vFsO619hYuN2STLTA9Rs+946qXa3ZCDh9L5Vg8wbHLTKhEpUY2099F5vlUg/ZoC07vEbqvO6m6PnGa5uXFIQy5+AL8fiZupFvbhH3FDGhIX+peIqYy9zrmu5X4HVouy7uic3fBk/HXDh4AE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=DbaIkl2u; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="DbaIkl2u" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-428e09ee91eso4317305e9.3 for ; Sun, 25 Aug 2024 07:14:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724595280; x=1725200080; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=dPfVC68w4G9TItKcZX9hLfDBOa9Rh2fNT0mcRYJpZNk=; b=DbaIkl2uSmArqx0PUn0teFwLTCDMeIkAbHsVoL3RRa8FdwYlGb1waGz7uRdsj3re1D hJi0vdG/Sh3yue3V8m5OdvumUXooAUcy2aPZqcBjupQHQSf9K5wn21n3P+2LKYeZfRCs pBE1+VCFCgkboalxPQ8Mi6xzT1IegFKsixjJI3yutr6ncjcua9MRGD7cbUFRYhanz7Yi +5Ij8ABNPkldq79j6DtTxbLbZoViKirP39SF3arUHPVeSZHNG8MfOLSGXHJe+rQzILYI 0Hn1JX+4jarlbZn+NPGXVy2k+OPHU4DXk7zoq+ffKxIFKCE38y4HUozc30Q9r+W69Fzg kUyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724595280; x=1725200080; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dPfVC68w4G9TItKcZX9hLfDBOa9Rh2fNT0mcRYJpZNk=; b=Sfl7IBGA4viZwyHspD2E0+tUpudmDaIYeNnzsiZpRGoToYHrWDOX6xR5ARrIvQJUNR rKb5vknTUWacW/u0mAJGl93q8A3F4McRdV+m2CzxnYNSQlREi14frZC/hfBVgZ/aOOqu en8OFN613+SBRxUASQnyH458nCW7cv+/1VpaJd1hATVYMoFzh5DfigzKqazDXugeNqPL XgAjgLuJosF9khZ+Xdjp6MCL9f4OfzDIMZdZ+/4IurYhOeexnQDDOVSsaZQuzti334H6 RE2tVz0vr854X1YvgsIFlfmYVTR033HQpzGcYPjVAu+Y4Onrko16kuSPFaxWTA3pS8fi O4cQ== X-Gm-Message-State: AOJu0Yx+r6qy4aPIM2O3kFEr7xnAFE9qKyjOA//i6Gga7aKG63S+zy44 Krg8wamTyC+7ZElXRi2EokCSQOcNfFzXZJtrwVcOxzqlYaAG0pg9/dhS6H6GU9I= X-Google-Smtp-Source: AGHT+IElMKRI5xZ8yzDk8JbJF8qKOxDYwCIunD6hU146I7V15XtRVaFAqCfrraqfYRZZ0YGENwgH/A== X-Received: by 2002:a05:600c:1c1f:b0:427:9f71:16ba with SMTP id 5b1f17b1804b1-42acca112admr31861355e9.5.1724595279439; Sun, 25 Aug 2024 07:14:39 -0700 (PDT) Received: from [127.0.1.1] ([178.197.222.82]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42ac5162347sm122556045e9.23.2024.08.25.07.14.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 07:14:39 -0700 (PDT) From: Krzysztof Kozlowski Date: Sun, 25 Aug 2024 16:14:28 +0200 Subject: [PATCH 5/5] reset: lpc18xx: simplify with devm_clk_get_enabled() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240825-reset-cleanup-scoped-v1-5-03f6d834f8c0@linaro.org> References: <20240825-reset-cleanup-scoped-v1-0-03f6d834f8c0@linaro.org> In-Reply-To: <20240825-reset-cleanup-scoped-v1-0-03f6d834f8c0@linaro.org> To: Philipp Zabel , Antoine Tenart , Sebastian Hesselbarth , Damien Le Moal , Palmer Dabbelt , Vladimir Zapolskiy Cc: linux-kernel@vger.kernel.org, Damien Le Moal , linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Krzysztof Kozlowski X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2441; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=3FUpFc5Q6VFd1fQ8A/U87QLsFQnyhnFox4YWGWQ0Hbk=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmyzxGxK3ymr8fJfvYSTHWGw3mhICORfcHW0/ex woHJNmabneJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZss8RgAKCRDBN2bmhouD 15u+D/9Enprg8sJbkA1Du6xadF51tsosIPpeLdcevWdfza41+UoHchX5cxoDdM6x3VHFYX5PSvr Vomw26pQKB8SMQUS38dtxNYBc3yrtp97ZP+t1ryzjTmkPEX7Nl76aJnQgsDxFFqoHepwuupIHCs FUoV6QMXQbjQvINTbf+hIky6dYdBoaYMe6ln95ldHsqc+3hJzfiKkum72zx3hK1kepxrvn7NikR O7dV/PuemP226IU/zwtMmhwCNTRaU+OFVdWrC807JD/Kua7UZ8bERqRR1aZw2p2jyyvXXCsb6yu gehSPqxngcswmzrm2lPn+CRZhKGdpxHLjyzoJX0edDaYAtvUeOlnVxKrm6mV6g0tPjV5p+qfj2P /CYDSpOaNixEpQqahTXrdrx1PW45Y7NVkfPYZaaFSqNLo5R17dbZCq960XCavRAdEXmAPCaVFa9 0TM+Rl5tlPvjpkKutR7FtTrJhq29nVqACJIFbcgK6Z2rr/X7He2hf76yDDfHTQM6xAq079EdQIr eGxBvKCPMoNs3sxD47j8uBxqztQ7eCWvZbGljfM3g2sPWhYi9n16BP95eZt9xH0cPj4nKAmNMWE jbXjXkQ/TK235iBhyt+rEN/t91x9JxGZmALel2kJeKHIejYXTEd75zBGb3WGxS93VDUjVyqBdBu i6S6vCcYnfzEz6w== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Use devm_clk_get_enabled() to drop clock prepare/unprepare parts and make code simpler. Change to dev_err_probe() in handling reset_controller_register() error to make it even simpler. Signed-off-by: Krzysztof Kozlowski Acked-by: Vladimir Zapolskiy Reviewed-by: Damien Le Moal Reviewed-by: Vladimir Zapolskiy --- drivers/reset/reset-lpc18xx.c | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/drivers/reset/reset-lpc18xx.c b/drivers/reset/reset-lpc18xx.c index e7896e3f1851..e42b2f24a93d 100644 --- a/drivers/reset/reset-lpc18xx.c +++ b/drivers/reset/reset-lpc18xx.c @@ -150,28 +150,16 @@ static int lpc18xx_rgu_probe(struct platform_device *= pdev) if (IS_ERR(rc->base)) return PTR_ERR(rc->base); =20 - rc->clk_reg =3D devm_clk_get(&pdev->dev, "reg"); + rc->clk_reg =3D devm_clk_get_enabled(&pdev->dev, "reg"); if (IS_ERR(rc->clk_reg)) return dev_err_probe(&pdev->dev, PTR_ERR(rc->clk_reg), "reg clock not found\n"); =20 - rc->clk_delay =3D devm_clk_get(&pdev->dev, "delay"); + rc->clk_delay =3D devm_clk_get_enabled(&pdev->dev, "delay"); if (IS_ERR(rc->clk_delay)) return dev_err_probe(&pdev->dev, PTR_ERR(rc->clk_delay), "delay clock not found\n"); =20 - ret =3D clk_prepare_enable(rc->clk_reg); - if (ret) { - dev_err(&pdev->dev, "unable to enable reg clock\n"); - return ret; - } - - ret =3D clk_prepare_enable(rc->clk_delay); - if (ret) { - dev_err(&pdev->dev, "unable to enable delay clock\n"); - goto dis_clk_reg; - } - fcclk =3D clk_get_rate(rc->clk_reg) / USEC_PER_SEC; firc =3D clk_get_rate(rc->clk_delay) / USEC_PER_SEC; if (fcclk =3D=3D 0 || firc =3D=3D 0) @@ -187,10 +175,8 @@ static int lpc18xx_rgu_probe(struct platform_device *p= dev) rc->rcdev.of_node =3D pdev->dev.of_node; =20 ret =3D reset_controller_register(&rc->rcdev); - if (ret) { - dev_err(&pdev->dev, "unable to register device\n"); - goto dis_clks; - } + if (ret) + return dev_err_probe(&pdev->dev, ret, "unable to register device\n"); =20 rc->restart_nb.priority =3D 192, rc->restart_nb.notifier_call =3D lpc18xx_rgu_restart, @@ -199,13 +185,6 @@ static int lpc18xx_rgu_probe(struct platform_device *p= dev) dev_warn(&pdev->dev, "failed to register restart handler\n"); =20 return 0; - -dis_clks: - clk_disable_unprepare(rc->clk_delay); -dis_clk_reg: - clk_disable_unprepare(rc->clk_reg); - - return ret; } =20 static const struct of_device_id lpc18xx_rgu_match[] =3D { --=20 2.43.0