From patchwork Sun Oct 6 17:43:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 833255 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 16426189F5A for ; Sun, 6 Oct 2024 17:43:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728236607; cv=none; b=TJO29wtzOepqtiCJYcl1421uFiWoGH/7DhL3Z5tz/qxKB618IBp/V5+TsHaa8wkSB3XyjhyIvjIGGVNUzG/8wG87yDQe56GkmF/YgkFfxYcIo5Fprsste6bcW2Tb0wGj/uuTPMu+ZnfLoM3i5VQY49OXdWknMTQCeBVREHw2ZOI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728236607; c=relaxed/simple; bh=SgkdYgUrVfbNVcDnV2gz2dPiBb4fP51a6SnhD3AvN14=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fEXdXXBDWvq9ip4Ou8BrR/qr8Uwu73CUHmCfkwNXf78Dds2cCDIByarn0gL6ugM4bQVug8lYIUhR6zUwvr7Crt1lWQ0AUuZlutzp7WuGNXwO3hcXCowopZ/KyXmu6v2FRgpzvmKg6wg6ZgVRZHcWwDsEkwYzz+iLjFfPQrgZF5k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=tenstorrent.com; spf=pass smtp.mailfrom=tenstorrent.com; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b=cai/yuOp; arc=none smtp.client-ip=209.85.210.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b="cai/yuOp" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-71dfc1124cdso486438b3a.1 for ; Sun, 06 Oct 2024 10:43:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tenstorrent.com; s=google; t=1728236605; x=1728841405; 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=djOgLMSN51sHizQfwcHscupKpoOvQDcxpJ2VLwRGCXg=; b=cai/yuOpXy2BWZp4hwKeqMb2dCO1oYQJcCfKc1vg3q5DtXezoYNxufhunYsBTjo9j7 SvsxfmakdomJBZ4MZRBp9flnw+NAKi/UG4oOGxfxSPDWjBAJr1tXlHvpCmQLTpkz2Y9X H89GyzZGT4MY4Jw6SJ1AONDzgQkWdhUq7rxETnKxYiRNWdPN38deU5LnJJtFJBhxjk9y A5K7fC2NzzoAFVRmf3g9YpuFkeQ8bOIQX49yd0QjAbqC3wAQvHvLRluQ5Joou/Dfmltc uWNHNYd/9YGyXqLKPNj/EaoqdlQxk2aJpj01E2IyDpvHSQWgYuCW2yLZXCb2p1bPYPtS eWvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728236605; x=1728841405; 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=djOgLMSN51sHizQfwcHscupKpoOvQDcxpJ2VLwRGCXg=; b=WZOWBkEc2ZcIAPwrOFXKb+rz23CJuohIp9w+JVUxFJhvSIJ/WrSBRtM7xxN0XHYTxF 5TYJBCQnXC7IqvzA4GBNTtlISE2m6RA1Jo2B84Ed4arTzp9f9Q3f1vDyaiXLAreynFgq SUt6qVS4ZvTGIU+Aq4hgqp2oEMs5I6LDaAd8MqveI+6Feo2NZuFtesL/FFpuZPywsbLV P1YyE0EfPEl6T4vtWxSxh1021FI9qUd0k5iB2rsJWblMVbMp1A1gsDlSJklnyt42KhGZ CWgkYfC4ThAytk/8YtBcTSA3S3xoKSEN4j1Pwu+CSMk5UNvFq3YVffEfu4Sd4mfGht01 U4Ug== X-Forwarded-Encrypted: i=1; AJvYcCWRGaEv76BAx1BRPVfi/MfRVRblVLwZqygs0rPK0wA23G5SWAuzHuwN26q0Z1nFdOVn+NquYcM/3y1e@vger.kernel.org X-Gm-Message-State: AOJu0Yw5uOHF1nhM88DwxqGFw6srKBsXuFKMqx0bfFdkmTnD5zEDCwgu Ti0eLkBYoOjQVbcjyZTcSiieW5lBVyCqEAyv9zEPv6eXe1Ag5uuij+mjvSmN7QkMZoTxmnWGNnj I X-Google-Smtp-Source: AGHT+IEfzDi9RgOylFPwN1JvO7nrxNbSXiuV8IIZXmhL/38SyLJYVdOoGtu60uzg4Rm52ToOrod0oA== X-Received: by 2002:a05:6a00:b84:b0:71e:190:c131 with SMTP id d2e1a72fcca58-71e0190c1b5mr3066456b3a.13.1728236605481; Sun, 06 Oct 2024 10:43:25 -0700 (PDT) Received: from [127.0.1.1] (71-34-69-82.ptld.qwest.net. [71.34.69.82]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0d6526bsm2999591b3a.159.2024.10.06.10.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Oct 2024 10:43:25 -0700 (PDT) From: Drew Fustini Date: Sun, 06 Oct 2024 10:43:23 -0700 Subject: [PATCH v2 3/3] pinctrl: th1520: Convert dt child node loop to scoped iterator Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241006-th1520-pinctrl-fixes-v2-3-b1822ae3a6d7@tenstorrent.com> References: <20241006-th1520-pinctrl-fixes-v2-0-b1822ae3a6d7@tenstorrent.com> In-Reply-To: <20241006-th1520-pinctrl-fixes-v2-0-b1822ae3a6d7@tenstorrent.com> To: Drew Fustini , Guo Ren , Fu Wei , Linus Walleij Cc: linux-riscv@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Drew Fustini X-Mailer: b4 0.14.1 Convert th1520_pinctrl_dt_node_to_map() to use a scoped iterator with for_each_available_child_of_node_scoped(). As a result, there is no need to call of_node_put() anymore. The put_child label has been renamed to free_map which is now a more accurate description. Suggested-by: Linus Walleij Signed-off-by: Drew Fustini --- drivers/pinctrl/pinctrl-th1520.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/pinctrl/pinctrl-th1520.c b/drivers/pinctrl/pinctrl-th1520.c index 7ed3f82b9339..286c6b2b0b13 100644 --- a/drivers/pinctrl/pinctrl-th1520.c +++ b/drivers/pinctrl/pinctrl-th1520.c @@ -425,11 +425,10 @@ static int th1520_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev, int ret; nmaps = 0; - for_each_available_child_of_node(np, child) { + for_each_available_child_of_node_scoped(np, child) { int npins = of_property_count_strings(child, "pins"); if (npins <= 0) { - of_node_put(child); dev_err(thp->pctl->dev, "no pins selected for %pOFn.%pOFn\n", np, child); return -EINVAL; @@ -445,7 +444,7 @@ static int th1520_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev, nmaps = 0; guard(mutex)(&thp->mutex); - for_each_available_child_of_node(np, child) { + for_each_available_child_of_node_scoped(np, child) { unsigned int rollback = nmaps; enum th1520_muxtype muxtype; struct property *prop; @@ -458,7 +457,7 @@ static int th1520_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev, if (ret) { dev_err(thp->pctl->dev, "%pOFn.%pOFn: error parsing pin config\n", np, child); - goto put_child; + goto free_map; } if (!of_property_read_string(child, "function", &funcname)) { @@ -524,7 +523,7 @@ static int th1520_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev, npins, (void *)muxtype); if (ret < 0) { dev_err(thp->pctl->dev, "error adding function %s\n", funcname); - goto put_child; + goto free_map; } } } @@ -535,8 +534,7 @@ static int th1520_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev, free_configs: kfree(configs); -put_child: - of_node_put(child); +free_map: th1520_pinctrl_dt_free_map(pctldev, map, nmaps); return ret; }