From patchwork Thu Mar 13 07:18:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 14014491 Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (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 31A5B1FC102; Thu, 13 Mar 2025 07:18:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741850292; cv=none; b=qNnScgHGMafg+1wN2pfDJms+HMhFGxLXw7astKoDViekbwATKndA2gO+ERuz4rC4ef7cFCQvLlgCjw52QrU2F7UwNhqjB7JIhtNSmbcOsCWRYL8qv/KkLnTry0O7PL9gqXns0LldjPiDPoAT/a8JU1tujcjeNiyVoQaTaDA4hsk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741850292; c=relaxed/simple; bh=f8ZnW3oO3kWzj9xDjSgBVqOoaNahbzAF5dOy2Fh++kE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=oVorPt4uc3x1c08OM6oBTjNEcBSr2UO1F4Xs1BPCC3nQX7QVQTbjleldMw3OU7AZ5nQfnWmXGs7amE1aGCsoqWi5nUG5r51eVyj2R4YwPLEQ/rvSO96m9mRFc1QE2KD4MhHiCo9m5KAW5nNrBLP+l10tQtPLtbAql6WVGCu4Us4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Zfb6fPLd; arc=none smtp.client-ip=209.85.208.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Zfb6fPLd" Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-30bf8f5dde5so6069751fa.2; Thu, 13 Mar 2025 00:18:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741850288; x=1742455088; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=S6OQ0UScw9oWVqgjbWQLTmLI2FDlmbWiio4NLFE3cNQ=; b=Zfb6fPLdyWsgy1t5Y/eO1r5/A06bq2hp8VOMJIU5fmNwt/B8Y8SeVl/9sQMqqd1zj0 VHDfDfkjxxZDxgvXzazHml91PErt1jn8HSDEpaqP/Wu8M5hXV9EVD7NZKLXp0oSdBab3 3R/ahYxMeSf6Zjwgln2uD3DX4Zd/pcl3tdFCR0MQPVFoYoZrMqtYNz/3ifLUNPtDEE7H bteRFVnT8QfeLE8nEltIHgj2umFlV91h8By9EiWm5wS4ooP4tstKkdS9TAWnBDZDo9xo /xUNJtR0uFQw8Rw3LnE7gawSbMl2S4jPrKOB6zD4YhECBxOoPrdkhvuG0v7VsvDbdCSK hj4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741850288; x=1742455088; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=S6OQ0UScw9oWVqgjbWQLTmLI2FDlmbWiio4NLFE3cNQ=; b=tzLAe3OW7xZQ8P6KHicmLhB0/cPei8msdiOqySh5mgJzCBN9EUjUU8N0fAf7JiRT09 h/EbaOLc58OX32m5zmd+YZk68nlGu3yaiKlNGDB908p3Jex6nknwC756UrSMYLlk/IAd o8n2w3zkG441JJ/f8mCBFKemSbugI9u2CnSRabWUNsAXBgm2dr2p91A8HPbHrvITgN8r BTLaTIP91uKB3J5nhHlUHqjlb5M71q5CsZ4ctwGpRcE+5T27uO0FFTBdDeHim/rPat74 SyhOgLF9zPwofftBF1N43oO6wBTxmLqvRaTEFDHzm6Zq1+tQVRf1lxv+w34vWxKCRK9v xDNA== X-Forwarded-Encrypted: i=1; AJvYcCUdkldFZTMi99oZoa8BNn5u8isniCS2PwsLQMYLhF5XmwjVMiykb3RTilHSK0X1Y8Kp1ZAE1BHojPIS@vger.kernel.org, AJvYcCUsNu88Q407USJEz9E0680I7sUZjlKmoykPLn82oEEGOSN1LxBx72EjF39bD8rfKMIjenh2P5uzbQ2pGZXH@vger.kernel.org, AJvYcCWOrQy7APWxJMyFW3XSNKtwMyCH0FLeV+gzMNyFuGa2dzJS6D55xRXfN7bVR0FrjXdnMlwF9tSk@vger.kernel.org, AJvYcCWiivILHNU8zeS0bDwS7OiqlcSqqBRqEW2/RyXoyRiqm9Lf9/iVSfFBWNPK+VqFIGrdAP3eXj4JuDAGgQ==@vger.kernel.org, AJvYcCX+azUwH93afWtLXG9nKsBSac7CI5VofXysAo+61HqCykWMc/+0vlVIInl7KTftM6Jhwiit78Z3++KV@vger.kernel.org X-Gm-Message-State: AOJu0Yw64XQeeDrxt3ytSp1VgVYwTmRyaryGT6GKtmlY+GhDWy/90R0P KNyL8QpihnKiKUtJ16Dam/Z+fYqwDQ88+MvwLcjeMpfrpjFVKeWe X-Gm-Gg: ASbGncv8SlMMltFNNhJN8DDFgYHU56z9L+R15QYgzliObLny+qon8UQEaWtV7YoSiZs zARsMY3V+RkS1is2o/KwhiN3vGeHW2EBjiLKlTazBPLFwRSIoUUBI9QCE7BQr79tzZAgHLNwwAI pyalNydcRSpsckR/8zfcMiXWdFzzfBbLhf2cV8l4KzYa/ogDUceQQ16W5a9QQOiTXunh5l0KyUE GSKYtpFUKw9HhWVMpiqkTQ2TXogdMf1OMhZ2pHkfW9IDVjYLRSybC+de4gaq98+XEp5Ble1BPT2 lL0a9/LtJ1LSeDqBC3hn/TiGEDqRirt78Kl/o+/QpSJfTTgLzBw= X-Google-Smtp-Source: AGHT+IHzZv16Eu3w2zLkjkG+6Z49HMA0c9ugl4Tm5n7/tbL2xQpVPA78kgBBEziTb7/bu9L9u95PWQ== X-Received: by 2002:a05:6512:3da3:b0:545:8a1:536e with SMTP id 2adb3069b0e04-54990e2be7bmr8687493e87.6.1741850288124; Thu, 13 Mar 2025 00:18:08 -0700 (PDT) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549ba885982sm117495e87.192.2025.03.13.00.18.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 00:18:05 -0700 (PDT) Date: Thu, 13 Mar 2025 09:18:00 +0200 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , Matti Vaittinen , Claudiu Manoil , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v7 02/10] property: Add functions to iterate named child Message-ID: References: Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: There are a few use-cases where child nodes with a specific name need to be parsed. Code like: fwnode_for_each_child_node() if (fwnode_name_eq()) ... can be found from a various drivers/subsystems. Adding a macro for this can simplify things a bit. In a few cases the data from the found nodes is later added to an array, which is allocated based on the number of found nodes. One example of such use is the IIO subsystem's ADC channel nodes, where the relevant nodes are named as channel[@N]. Add helpers for iterating and counting device's sub-nodes with certain name instead of open-coding this in every user. Suggested-by: Jonathan Cameron Signed-off-by: Matti Vaittinen Reviewed-by: Andy Shevchenko Reviewed-by: Marcelo Schmitt --- Revision history: v6 => v7: - Improve kerneldoc - Inline device_get_named_child_node_count() and change it to call fwnode_get_named_child_node_count() inside - Fix indentiation of the new macros v5 => v6: - Add helpers to also iterate through the nodes. v4 => v5: - Use given name instead of string 'channel' when counting the nodes - Add also fwnode_get_child_node_count_named() as suggested by Rob. v3 => v4: - New patch as suggested by Jonathan, see discussion in: https://lore.kernel.org/lkml/20250223161338.5c896280@jic23-huawei/ --- drivers/base/property.c | 27 +++++++++++++++++++++++++++ include/linux/property.h | 24 ++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/drivers/base/property.c b/drivers/base/property.c index c1392743df9c..83fa0d0ee1f5 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -945,6 +945,33 @@ unsigned int device_get_child_node_count(const struct device *dev) } EXPORT_SYMBOL_GPL(device_get_child_node_count); +/** + * fwnode_get_named_child_node_count - number of child nodes with given name + * @fwnode: Node which child nodes are counted. + * @name: String to match child node name against. + * + * Scan child nodes and count all the nodes with a specific name. Potential + * 'number' -ending after the 'at sign' for scanned names is ignored. + * E.g.:: + * device_get_named_child_node_count(dev, "channel"); + * would match all the nodes:: + * channel { }, channel@0 {}, channel@0xabba {}... + * + * Return: the number of child nodes with a matching name for a given device. + */ +unsigned int fwnode_get_named_child_node_count(const struct fwnode_handle *fwnode, + const char *name) +{ + struct fwnode_handle *child; + unsigned int count = 0; + + fwnode_for_each_named_child_node(fwnode, child, name) + count++; + + return count; +} +EXPORT_SYMBOL_GPL(fwnode_get_named_child_node_count); + bool device_dma_supported(const struct device *dev) { return fwnode_call_bool_op(dev_fwnode(dev), device_dma_supported); diff --git a/include/linux/property.h b/include/linux/property.h index e214ecd241eb..7411dfdaadc0 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -167,10 +167,18 @@ struct fwnode_handle *fwnode_get_next_available_child_node( for (child = fwnode_get_next_child_node(fwnode, NULL); child; \ child = fwnode_get_next_child_node(fwnode, child)) +#define fwnode_for_each_named_child_node(fwnode, child, name) \ + fwnode_for_each_child_node(fwnode, child) \ + if (!fwnode_name_eq(child, name)) { } else + #define fwnode_for_each_available_child_node(fwnode, child) \ for (child = fwnode_get_next_available_child_node(fwnode, NULL); child;\ child = fwnode_get_next_available_child_node(fwnode, child)) +#define fwnode_for_each_available_named_child_node(fwnode, child, name) \ + fwnode_for_each_available_child_node(fwnode, child) \ + if (!fwnode_name_eq(child, name)) { } else + struct fwnode_handle *device_get_next_child_node(const struct device *dev, struct fwnode_handle *child); @@ -178,11 +186,19 @@ struct fwnode_handle *device_get_next_child_node(const struct device *dev, for (child = device_get_next_child_node(dev, NULL); child; \ child = device_get_next_child_node(dev, child)) +#define device_for_each_named_child_node(dev, child, name) \ + device_for_each_child_node(dev, child) \ + if (!fwnode_name_eq(child, name)) { } else + #define device_for_each_child_node_scoped(dev, child) \ for (struct fwnode_handle *child __free(fwnode_handle) = \ device_get_next_child_node(dev, NULL); \ child; child = device_get_next_child_node(dev, child)) +#define device_for_each_named_child_node_scoped(dev, child, name) \ + device_for_each_child_node_scoped(dev, child) \ + if (!fwnode_name_eq(child, name)) { } else + struct fwnode_handle *fwnode_get_named_child_node(const struct fwnode_handle *fwnode, const char *childname); struct fwnode_handle *device_get_named_child_node(const struct device *dev, @@ -210,6 +226,14 @@ int fwnode_irq_get_byname(const struct fwnode_handle *fwnode, const char *name); unsigned int device_get_child_node_count(const struct device *dev); +unsigned int fwnode_get_named_child_node_count(const struct fwnode_handle *fwnode, + const char *name); +static inline unsigned int device_get_named_child_node_count(const struct device *dev, + const char *name) +{ + return fwnode_get_named_child_node_count(dev_fwnode(dev), name); +} + static inline int device_property_read_u8(const struct device *dev, const char *propname, u8 *val) { From patchwork Thu Mar 13 07:18:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 14014492 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.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 8E0851FC114; Thu, 13 Mar 2025 07:18:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741850309; cv=none; b=rkNA2s3mGHjAF/W4BK7OjUhRCgjKvqQhAkfZPP5izPY6OekDoCA20QynH1/9FW40hDwjyLnZD6+D6/oMZyuCoBBUJIlOgVT1gWhX5pTP2+miwbTa8v9gWlDcTV2dknaignTeZST7dxbcpeuoA6/aajZZZDItKQmNv67NbJ6ILz4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741850309; c=relaxed/simple; bh=rH8HYpQvPj2AhkP4iS9WMtYETITljdfi506n9WtdcOM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=d1Vepa0VL1cEM+XvKl6pJ9a4CIiGz+FBzUvE1SlTKUqVtoVxyr7zHcorV96tNkn09u/yxsbj45ufOGenbGe3FC82qvfUEFAsBTO88WXbxXllC2kGD0qmMMmxWQJd+AlSfR6A7N38EsZpWOtbu0Tynb12hTW5EzbEGPf2aoLkYis= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lJ+jiJr0; arc=none smtp.client-ip=209.85.167.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lJ+jiJr0" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-543d8badc30so736700e87.0; Thu, 13 Mar 2025 00:18:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741850306; x=1742455106; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=yBGWyI2KhlGLTlExLjTIG8zzVp+t1U4InfDr+/tp5Go=; b=lJ+jiJr0dgd6sX+WOcBFtEykz9aGctwCzFcIArL25gJMC4JqEJ2oYCOjzq8UTvHUXm 5byOqm5rFhpo1rB9M2PI6d30tp+PsVRL0WUcQvU4gXUAtOTqLEvAiJjJRMRD3USViXhm lt2bMs46rQ19JyXV4vM7WVQX1G61rFT11RwvKKu8g2rRRyN+KShzcII3msEB4LWhEsZz kE6+euzHWyz+yLy+Kx6MBYAsfNzYDIP+rrZklDCtdh0tpIqgKHPpPsZroOFDRCRGYFKg yb3pLItR9NfBuTqOq+8WtBMXMoy3sZmmFG4XoPBbtF17qcCaKic69jrWUwCE3l2Wrx5y Kq/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741850306; x=1742455106; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yBGWyI2KhlGLTlExLjTIG8zzVp+t1U4InfDr+/tp5Go=; b=ruRVfKW0hrOZEkpEz8I5QEE/CBJPI0r76Ty6PDulhqQ314qISEhKLIfSEvZobr6UNJ StDdukQVcu3VzzU0XfRBSBGw5+SdAALh0eQsZuEJp3PQ1wYKF/FS0k6LHm88VKMLkSLW HXqCNcO2m4CCW3hjiUiEq6Ttn46McxdJscHK0H/4M9ZzJKneKink08+KOH2TkX6UghA4 N0tb+iFa1ZAlltruZzFvImL/008W9agrSoQSxazVohNZDZ1sXbj5l1UTqJWdEa6lozax J79L5A+bdwetSzspCKDmlRR1fwf5bxZs95saIUpxdbJjH9ggcHkkrnw1gNjn9Mv3A9Jt MDfQ== X-Forwarded-Encrypted: i=1; AJvYcCU53Nn5aa+0ObBRnC5jSgKhQXehPfZF6/tNYs+xKKhs+vkp351cfOtwIH+eGmNaJ/1rBrduDurHczjn1OgE@vger.kernel.org, AJvYcCUiVMt3zwomzAllZIN6O3K0PzLY5kT/dsdXd0ghTluqi1ev0kmvo5tG9Ez6/RSSC0KuKeV0nir8eF7L@vger.kernel.org, AJvYcCVz3QucnGyt4jqxmTV9ArmVsEpIuTtRNSTOuF9ur+DQYkUb2x07L2FzhMVEfMDgxHAH9f+c+jWVuOYs@vger.kernel.org, AJvYcCWNkNO4FtaFK81OgQ5NtmlNeszs1nMU2zCK/eT4DEfZpm/hstt7L+eVmO0ZDhuT4MayYvtEChpGrXN42A==@vger.kernel.org, AJvYcCWzQ774iXMmIcoAiKE/akNKsy43Af6eJL21bRJuMA7ZFbkQPIIKZQE9buwvIyn/UAtaG8f99mbUQurujYRRuONt8jU=@vger.kernel.org X-Gm-Message-State: AOJu0Yysw0G4xfIlYvBJ8yqK/J12HIpZk1iDEtiw5m/1FIu9A4YWVsKn e0gGZlZQluZGvv8GRqM454zZLADGOgljBMcJkYcseGHewe/QFDmK X-Gm-Gg: ASbGncuJXqD1nskpbpi8bE9fdk+kL7rqAJik1u4WuHLnhzR6BYaN9ZyZ/S1OScpOjzv h9zySNqgjitYJYc/IZkEGWvbqLraWFlSEjcPyoyU/e6TTwKxVLhxOMTtJ69/9waZUF+GPDgx+5V mEb7E8A/KXC9wLPOS+AoqTEJ2XNKOWdbnZUJm4aPQ/CTsxlWxDNgx22ZhRSwQugXGdy7rnocmi+ t6cxOZfYPpBhhRz6qtROdBWhcXffj3W4GHdOTB4vjHguFjttGjtyYOTdZNOCN0/CTra4Z904psQ UTRTL6CGSiHylfoNAdh3V2E/5BNK5fXSSFoESFK9ZpdvCYBJVjo= X-Google-Smtp-Source: AGHT+IGP8h2FL/lCirDVHljxL5OfQTimB9tsLIQ+xH91borETZK6KwSphvw7DjFZLuCzX4cD5bzVZg== X-Received: by 2002:ac2:4c46:0:b0:543:baa3:87ab with SMTP id 2adb3069b0e04-549910b7f23mr8760741e87.47.1741850305346; Thu, 13 Mar 2025 00:18:25 -0700 (PDT) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549ba7c2677sm117486e87.95.2025.03.13.00.18.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 00:18:24 -0700 (PDT) Date: Thu, 13 Mar 2025 09:18:18 +0200 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Jonathan Cameron , Lars-Peter Clausen , Andy Shevchenko , Matti Vaittinen , Lad Prabhakar , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Hugo Villeneuve , Nuno Sa , David Lechner , Javier Carrasco , Guillaume Stols , Dumitru Ceclan , Trevor Gamblin , Matteo Martelli , Alisa-Dariana Roman , Ramona Alexandra Nechita , AngeloGioacchino Del Regno , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: [PATCH v7 03/10] iio: adc: add helpers for parsing ADC nodes Message-ID: References: Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: There are ADC ICs which may have some of the AIN pins usable for other functions. These ICs may have some of the AIN pins wired so that they should not be used for ADC. (Preferred?) way for marking pins which can be used as ADC inputs is to add corresponding channels@N nodes in the device tree as described in the ADC binding yaml. Add couple of helper functions which can be used to retrieve the channel information from the device node. Signed-off-by: Matti Vaittinen --- Revision history: v6 => - No changes v5 => v6: - Adapt to changed fwnode helper names - Fix spelling v4 => v5: - Inline iio_adc_device_num_channels() - Fix Indenting function parameters - Combine the max channel ID checks. v3 => v4: - Drop diff-channel support - Drop iio_adc_device_channels_by_property() - Add IIO_DEVICE namespace - Move industrialio-adc.o to top of the Makefile - Some styling as suggested by Andy - Re-consider included headers v2 => v3: Mostly based on review comments by Jonathan - Support differential and single-ended channels - Rename iio_adc_device_get_channels() as iio_adc_device_channels_by_property() - Improve spelling - Drop support for cases where DT comes from parent device's node - Decrease loop indent by reverting node name check conditions - Don't set 'chan->indexed' by number of channels to keep the interface consistent no matter how many channels are connected. - Fix ID range check and related comment RFC v1 => v2: - New patch --- drivers/iio/adc/Kconfig | 3 ++ drivers/iio/adc/Makefile | 2 + drivers/iio/adc/industrialio-adc.c | 79 ++++++++++++++++++++++++++++++ include/linux/iio/adc-helpers.h | 27 ++++++++++ 4 files changed, 111 insertions(+) create mode 100644 drivers/iio/adc/industrialio-adc.c create mode 100644 include/linux/iio/adc-helpers.h diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 849c90203071..37b70a65da6f 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -6,6 +6,9 @@ menu "Analog to digital converters" +config IIO_ADC_HELPER + tristate + config AB8500_GPADC bool "ST-Ericsson AB8500 GPADC driver" depends on AB8500_CORE && REGULATOR_AB8500 diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index ee19afba62b7..1c410f483029 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -3,6 +3,8 @@ # Makefile for IIO ADC drivers # +obj-$(CONFIG_IIO_ADC_HELPER) += industrialio-adc.o + # When adding new entries keep the list in alphabetical order obj-$(CONFIG_AB8500_GPADC) += ab8500-gpadc.o obj-$(CONFIG_AD_SIGMA_DELTA) += ad_sigma_delta.o diff --git a/drivers/iio/adc/industrialio-adc.c b/drivers/iio/adc/industrialio-adc.c new file mode 100644 index 000000000000..6cfb001c74b9 --- /dev/null +++ b/drivers/iio/adc/industrialio-adc.c @@ -0,0 +1,79 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Helpers for parsing common ADC information from a firmware node. + * + * Copyright (c) 2025 Matti Vaittinen + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +/** + * devm_iio_adc_device_alloc_chaninfo_se - allocate and fill iio_chan_spec for ADC + * + * Scan the device node for single-ended ADC channel information. Channel ID is + * expected to be found from the "reg" property. Allocate and populate the + * iio_chan_spec structure corresponding to channels that are found. The memory + * for iio_chan_spec structure will be freed upon device detach. + * + * @dev: Pointer to the ADC device. + * @template: Template iio_chan_spec from which the fields of all + * found and allocated channels are initialized. + * @max_chan_id: Maximum value of a channel ID. Use -1 if no checking + * is required. + * @cs: Location where pointer to allocated iio_chan_spec + * should be stored. + * + * Return: Number of found channels on success. Negative value to indicate + * failure. + */ +int devm_iio_adc_device_alloc_chaninfo_se(struct device *dev, + const struct iio_chan_spec *template, + int max_chan_id, + struct iio_chan_spec **cs) +{ + struct iio_chan_spec *chan_array, *chan; + int num_chan = 0, ret; + + num_chan = iio_adc_device_num_channels(dev); + if (num_chan < 1) + return num_chan; + + chan_array = devm_kcalloc(dev, num_chan, sizeof(*chan_array), + GFP_KERNEL); + if (!chan_array) + return -ENOMEM; + + chan = &chan_array[0]; + + device_for_each_named_child_node_scoped(dev, child, "channel") { + u32 ch; + + ret = fwnode_property_read_u32(child, "reg", &ch); + if (ret) + return ret; + + if (max_chan_id != -1 && ch > max_chan_id) + return -ERANGE; + + *chan = *template; + chan->channel = ch; + chan++; + } + + *cs = chan_array; + + return num_chan; +} +EXPORT_SYMBOL_NS_GPL(devm_iio_adc_device_alloc_chaninfo_se, "IIO_DRIVER"); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Matti Vaittinen "); +MODULE_DESCRIPTION("IIO ADC fwnode parsing helpers"); diff --git a/include/linux/iio/adc-helpers.h b/include/linux/iio/adc-helpers.h new file mode 100644 index 000000000000..56b092a2a4c4 --- /dev/null +++ b/include/linux/iio/adc-helpers.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* + * The industrial I/O ADC firmware property parsing helpers + * + * Copyright (c) 2025 Matti Vaittinen + */ + +#ifndef _INDUSTRIAL_IO_ADC_HELPERS_H_ +#define _INDUSTRIAL_IO_ADC_HELPERS_H_ + +#include + +struct device; +struct iio_chan_spec; + +static inline int iio_adc_device_num_channels(struct device *dev) +{ + return device_get_named_child_node_count(dev, "channel"); +} + +int devm_iio_adc_device_alloc_chaninfo_se(struct device *dev, + const struct iio_chan_spec *template, + int max_chan_id, + struct iio_chan_spec **cs); + +#endif /* _INDUSTRIAL_IO_ADC_HELPERS_H_ */ From patchwork Thu Mar 13 07:19:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 14014493 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (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 C13A01FC0ED; Thu, 13 Mar 2025 07:19:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741850367; cv=none; b=bOvazebPc+kBl/GR4F3JIsYk+J/2kJ3u8zYSbdxUwYUGg1tZ24ZMdDBDVDzmG/9Hb1Aj7YBrlaEbZQAX0q1AW0wdwJInNgaSjgCO6Xzk5j4qyqNbBN9glnWhUoSVBRkFP2wiX8JUVC74d0B9zVxtAs1+1thmjWujkP4axw6q8ws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741850367; c=relaxed/simple; bh=Ybr4ppd4ggfhezGrA8SGEZN+uoR4U/7erGa8s7nsu5Y=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=BlL3Ymr0ELMFVStbpsC3jxD75CqroRkHqKaZNSbk5X0RrEKxXbBm3HIUOFfhxzDHKsvCGU7M9qZZqPVfteegCoQH3AaDaaVMZ7DN118RXV4uc/sVf/DMBLDnQQZ8RdzVTahq1aEIMwKgeVQIA+vDcLUXYjRrDzDAaVebS0vy3eo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dwNQlxQ+; arc=none smtp.client-ip=209.85.208.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dwNQlxQ+" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-30bd21f887aso5509391fa.1; Thu, 13 Mar 2025 00:19:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741850364; x=1742455164; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=xFwqzBXDybwuD2vjc1RKwbgfdx/o0MRc2L5yNvshUHo=; b=dwNQlxQ+wC0d3jXCdfEhHVUbQe2q7DyJGgyluwoOuMeHBgmKUBsEznEYy5Vfticld1 WrnRj2i1O1Q5Zqhzq+yIbIA/0dQsbj9UartQOnkCBiAQUIUqm5rH39kofM40m0sj5mtg AE+M2qOVej6OVIBUxGa2thu3Z0x0T8tlmSSNsoxrNuM7qQmZLD2Go5pqE/2Hg/i0rMmg Gu6RSxieGg4PNwYD9jn9GxGXCijO8s66Bn4bn1sJD679n77hIXVeW6lQZBHpVOGKhtMl plsKf+DDaEy0wbmYpre7aBtJvf1yTNPWIJ8tWhkR4ubSG0jM6mis/dbEGUX4uMwksXTF G3tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741850364; x=1742455164; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xFwqzBXDybwuD2vjc1RKwbgfdx/o0MRc2L5yNvshUHo=; b=L4++30+uswUmPT7MGKP3ZTS/AGuYw3uiCCdv62mR9CjJtKtT3GjlQifA3hOtKtqrpg OV3Sr2hqb4Y2IZCJ+FF657e/pj4mjieqaJrUDrCNM7WqS733eY9wVust3Kpx3nNE8CQn LNXNIT3U1+nVwcVc9ZAEHqVyh5xjxQeRGxZ0qanFioC17geJE8DgtBpEnwXiiwUA9sAz ooOd4nQ+ZZDNRUidYdArF1mVs22tCXQdLPQIG0v+f6ejymUsblL0OJnThv6jeLZEPIkp PCk6D7EkcW3RlceE9+VKIkdokrife1FKJ0LBZYFYcoEGeRYtTIwx0oD8nC+im3LTFFbn FcEA== X-Forwarded-Encrypted: i=1; AJvYcCUKS2PUv4YvaLwtZ7H7DS1Kz9yzM/79jY6AjwWHKvO5yjbU88EI1MdnNmo51NrqpfIsxRUz4DeLcaXBuA==@vger.kernel.org, AJvYcCUh7uvkqCVDXVtFCHOtiXw2FUPcO4S8cvmw3dHidJ6yQG3zDPQfjAc4cxl8EOl3UZLRo/GtM+n/Rv1U@vger.kernel.org, AJvYcCVkyAVPUQ6k+UefXx/j7ldNeCjbUZlKe3NBVMv0I48hPTnN5VPTiy4kBvzrnqYMW8SOr5FhFYnlqWMfwPia@vger.kernel.org, AJvYcCWZ4n8uyfoRPg2/g4E+JIHitKyEB6w6JbnnRXQnLi2FspQ2QCI5J1w1YAPpTUbyS3rE5Ng0EbpWHPsL@vger.kernel.org, AJvYcCWfTa58u6XxRdPraQEk8cGprMtG0OktL9OeoTz94IDQ5a/nYYSGHiay2pUWIMwZJh0EgoMXTG9FbSqzoe9AI5bhBU8=@vger.kernel.org X-Gm-Message-State: AOJu0YyvQZMlH11OmuzA6T/q9K2IPlvbkAaUGXJmH+1VoYcftb9aDrdJ UuoRBdvpVggHu8z+ZyqP9Fr4+Ja3rXYnIZvXVMxZ52SP/YMYA2YW X-Gm-Gg: ASbGncvOdt+XdHcy6J8CSzu0ZAfDuxOVmBbtTuMcvalkepuLVqK4Ur6RZvsLnw+T8mD oX6A7AN/PJf7AShAdDbYVfNRkX7UqzrEO/AHmDfDoYxmzsO02Oavd4DHVH6fpfTbK1aB10OECbr dcwu/kgYBH+a0LnMQFFlHmext2tILQPTLc/jYMNvg6Wpt5j4+jBa2OR0GMQLWo4KoEtQcVoiQdM JUkShb6tuttFzV38ApnquWicJNMVHSPgSJx3fBj+SEE9N9lK0Y27DddNurjfJ1asBnNXcLWbmP1 /q9UGTQPFR1DF+DIC2P+2qVITaDwBMQHXwF2k2XBiPvnneoW5ss= X-Google-Smtp-Source: AGHT+IEjv3VEotqH5VFMYNkLSITb7yxLQ+/ZPsDGqrkSfM+X1MuBHj1FF3/q86MbLY14fdbT78uThw== X-Received: by 2002:a05:6512:3da3:b0:545:1082:91a1 with SMTP id 2adb3069b0e04-54990e2bd29mr8607537e87.7.1741850363715; Thu, 13 Mar 2025 00:19:23 -0700 (PDT) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549ba8851c4sm117554e87.199.2025.03.13.00.19.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 00:19:21 -0700 (PDT) Date: Thu, 13 Mar 2025 09:19:17 +0200 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Jonathan Cameron , Lars-Peter Clausen , Andy Shevchenko , Matti Vaittinen , Lad Prabhakar , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Hugo Villeneuve , Nuno Sa , David Lechner , Javier Carrasco , Guillaume Stols , Dumitru Ceclan , Trevor Gamblin , Matteo Martelli , Alisa-Dariana Roman , Ramona Alexandra Nechita , AngeloGioacchino Del Regno , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: [PATCH v7 07/10] MAINTAINERS: Add IIO ADC helpers Message-ID: References: Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Add undersigned as a maintainer for the IIO ADC helpers. Signed-off-by: Matti Vaittinen --- Revision history: v2 => - No changes RFC v1 => v2: - New patch --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 8e0736dc2ee0..5b96fb864227 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11208,6 +11208,13 @@ L: linux-media@vger.kernel.org S: Maintained F: drivers/media/rc/iguanair.c +IIO ADC HELPERS +M: Matti Vaittinen +L: linux-iio@vger.kernel.org +S: Maintained +F: drivers/iio/adc/industrialio-adc.c +F: include/linux/iio/adc-helpers.h + IIO BACKEND FRAMEWORK M: Nuno Sa R: Olivier Moysan From patchwork Thu Mar 13 07:20:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 14014494 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.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 CB81C1FBE8C; Thu, 13 Mar 2025 07:20:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741850420; cv=none; b=YZ/bIMrmNdSMOQ3l1uuRz11aohm12ISZ7aLWF0qduid7PaO/TLs6x0swbq2Qwbg+DBSMulOpDdewnO5eCyj9xh8LQ5bJB05tXIIMyQeMOS0YYzs3/MCd80WFMW01wqI4xcHvsV67G8tN9qDJ/fVySnDYuegoVaeKCNX7MvKSRu4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741850420; c=relaxed/simple; bh=8+5R8oAkf2w0knV/jkn16g5f4JhtDgvTITUpMQVzAQM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=AFRZEU7l7baI3r9cm1r0Lm/SBrR6E113Kote7mzuN3HF/KV6N/BETYzLffnFJGZ0SkRuwQGuhPDf7jcCW9RsxWTCNVnvrBF7F0bPndfYhvFwKaRp4UgbgOMNeseZpPhG/ILmUPlTSrM0wWq3V8XCZ9+CRUDv78RlFA+ELHic8aQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TFAARaF2; arc=none smtp.client-ip=209.85.167.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TFAARaF2" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-54957f0c657so596071e87.0; Thu, 13 Mar 2025 00:20:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741850417; x=1742455217; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=3DI6EVYpCVvB4/qiCa4qjIWIjpDvbPkgz7MveeCW3mw=; b=TFAARaF2J4gp1tSsDYzTHHIHBFggJLRxOP/xoT3OdOC4BZQbvFOTzTmLvNVLHWjkYX tousdCXreQcYFj+YjsxEcwY0MoczJEVmFCjNiThJ5jmH922102ExavnixkozE7aQwiRc NeyTcTLNkPrC5Qot9JsNBwG/M/Sb04foo/O+U01lyWl7qUx5WprEvbXZT6/v4MWnz7cf NOYAkElkmPBrJa1Rzk+Stmz6Hy48SZR6jMT1kES15gjcCT4LflnkK+At0xT0JtZQJXCd wsmU/KBgNbGlb3QxzPswzBRflN0/7qGq1jFD+W1GL0MqMp5LeFo5GIca+hXfjmqb7Tvw 8m/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741850417; x=1742455217; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3DI6EVYpCVvB4/qiCa4qjIWIjpDvbPkgz7MveeCW3mw=; b=C6Po9zTO1AdHP9YqgWCongIm5ztEMsPbuPmyUSZzIrBdvrJ7jftGY7yvhWRzWFFLC6 Pej/fTOtmCp6O2fwytVgfhSMjQCfe9i+ifC4BZ95JUSvuzhWHQ95emEko08TgdH/n6Qh wG9qMyQvG0M23+Y+ZvNoYqoLW/YHrF0k2C3EG32AsGBansqSXAnHnJrjqMDSqIAPjEII su9ytGg/LB9d+owt6cL6EL8tlrv5nm5G4e6FqUZDSWo/saWNH5Iw0wnbpNVybPUn+CQN fR2krbovEwhhn4QUDoIgH1u7AHG99hoFC3hVay/k3Nt1tKoF0RZY4yICuIwskbSOcuYR 8mqw== X-Forwarded-Encrypted: i=1; AJvYcCUxla5F1mQHU2MMKyDlJg88uaJHKCY5/423BDUqNuZtkhH7ZObSkrjvmwaSVD/njHp54T/uPV8g@vger.kernel.org, AJvYcCX9orGci0wuK4eqBHbwps2oB/Rkw9tzNeKJSXqCdTj2ewlzhA6Rj5EdytWpyNCy5+GVNDxQkmOeWvyHF4BG@vger.kernel.org, AJvYcCXoM8pmmA02beO9qWYlNAbMdA6WiNiBg/ayh3DBp0HvpqC8LZu1UtJeRiNXCXSkM26KGqGcdeEXHc6M@vger.kernel.org X-Gm-Message-State: AOJu0YzFXknmt5ExoB4jYx7TX5pFyoAoq1GnxgdweOIKT5A1oIYz1MVX ldXcwthyxboIjdooFMiLOSPGHKYz1C2/AU449B0wpJ4wK7A3K/Ap X-Gm-Gg: ASbGncv2278sJc1ZzTYEGA0aUlYMQID41zRhgijEoGldgxqABzsKgVd2cqwssNscSjT MY4eltNl8osCDPOGvmWyf7AZd4VEdVp6XAFUk32ELLuX0CCA2HeX9Djh73AUzAQkZYx9pxw4mMw SfqU6JWc8LuCID3NESHTgjh42oWsmZbJLx+55lHc6aRRWI+4iosx0rBjrN0HYngF9IkG+myO5Kh QO54/vtVcs372K0B8ubDR1aAiJzXpEdijH/1s+5L1FiRd0sGfwSqAO9E/fvgr5C9SfCZzU8YrpS 2mVO2roasalZoh92UBuYvylADRHDentlu8b4Snx643VcpcnY1Zg= X-Google-Smtp-Source: AGHT+IEvKiFXV8bl8B8NCAsPn4Q3j9WyAgKXI6XenFkBx9F27xE0i3dUdEtsIDU3jwE38eBjv4GKFQ== X-Received: by 2002:a05:6512:3a91:b0:545:81b:1516 with SMTP id 2adb3069b0e04-549ba402659mr516598e87.15.1741850416733; Thu, 13 Mar 2025 00:20:16 -0700 (PDT) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549ba864defsm119636e87.144.2025.03.13.00.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 00:20:14 -0700 (PDT) Date: Thu, 13 Mar 2025 09:20:10 +0200 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , Claudiu Manoil , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v7 net-next 09/10] net: gianfar: Use device_get_child_node_count_named() Message-ID: References: Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: We can avoid open-coding the loop construct which counts firmware child nodes with a specific name by using the newly added device_get_child_node_count_named(). The gianfar driver has such open-coded loop. Replace it with the device_get_child_node_count_named(). Suggested-by: Andy Shevchenko Signed-off-by: Matti Vaittinen Reviewed-by: Andy Shevchenko --- Revision history: v6 =>: - No changes v5 (RFC) => v6: - Drop RFC - Adapt to changed function name. It's fair to tell the pros and cons of this patch. The simplification is there, but it's not a big one. It comes with a cost of getting the property.h included in this driver which currently uses exclusively the of_* APIs. NOTE: This patch depends on the patch: [2/10] "property: Add functions to iterate named child" Compile-tested only! --- drivers/net/ethernet/freescale/gianfar.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 435138f4699d..d4ee0fc843be 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -97,6 +97,7 @@ #include #include #include +#include #include "gianfar.h" @@ -571,18 +572,6 @@ static int gfar_parse_group(struct device_node *np, return 0; } -static int gfar_of_group_count(struct device_node *np) -{ - struct device_node *child; - int num = 0; - - for_each_available_child_of_node(np, child) - if (of_node_name_eq(child, "queue-group")) - num++; - - return num; -} - /* Reads the controller's registers to determine what interface * connects it to the PHY. */ @@ -654,8 +643,10 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev) num_rx_qs = 1; } else { /* MQ_MG_MODE */ /* get the actual number of supported groups */ - unsigned int num_grps = gfar_of_group_count(np); + unsigned int num_grps; + num_grps = device_get_named_child_node_count(&ofdev->dev, + "queue-group"); if (num_grps == 0 || num_grps > MAXGROUPS) { dev_err(&ofdev->dev, "Invalid # of int groups(%d)\n", num_grps);