From patchwork Mon Mar 17 15:50:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 14019436 Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (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 D77B0182CD; Mon, 17 Mar 2025 15:50:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742226647; cv=none; b=rsGzWFoj/bgwFgbbg564DJPA1/DowTEdKG68lbOJlj26+XuhnP3JMJLq04eNRgql4LVpIN8T/BpqyXdN6I/nzYWFLM386tJdM+k1tNdz0y1mK07/PDLg30nkmuxayzdo2HU/S2vio7WB1Kslu8FDlKzE66lPRscy7tz3ldEW67g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742226647; c=relaxed/simple; bh=mplGLw3QnO7QHUtk8ViV2IhHKL6Xa3MisReIVwNOuK4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=m/sR+0diUIuwIvRN4VfQCbzjLcimeJZAvlDjr3Vn7vcvg2F0dG7tqzegGYACmP6CFlNGf8ZhTSLvsZ2WRkdT+X7raOe7j2NM6NO4sHP3mhjTTDqY7+rWTmt/vsZ96htDR4qmDvJkvitaw7arui/yqYsqQ4+Fc9XeqpMZd/cuIYI= 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=Mz8ARukM; arc=none smtp.client-ip=209.85.208.177 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="Mz8ARukM" Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-30c416cdcc0so45466091fa.2; Mon, 17 Mar 2025 08:50:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742226644; x=1742831444; 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=rqwZiC/7WfiT8YB/Z7vCMKWICsqaRgXx67Tyd7/Yc7Y=; b=Mz8ARukMbwwslzDGT8UrxwofmKbMKYxpCgxatl8j1NY67YJg0jJLwMwTgmWd0qc4zG bHUZll5olhXEpLm5XbfyVu2i07t8HsIa/bfyanP6wfceq9DxGromocnqTjV5Is+ERD0D YWCAvgYI1dFtuncad8hsmgo8c8HUIM5QK7WQC/tSeglhC/yd1A0OQS3qCA5XFFyxCsOI PgF7nVupq4YZvv+k3TVgeURFlbr2imxmA1q4c0T5ZK0H1I+prIE7YN9TivhF0p5ESKys OrssObnbulAl3h/iPlHgpu67embZIpTzYGhdvXAl6Qn1gKuJXHt7v7kVMrY3zV0Oxd7y nA+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742226644; x=1742831444; 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=rqwZiC/7WfiT8YB/Z7vCMKWICsqaRgXx67Tyd7/Yc7Y=; b=HBfee4dZfoIkiMjNwSbn1Aujt1KxjIRAPlOSCT0fB8alNromZDRsa5Ab+y7POtdPjg PHky7ks0oDGeILzYt1hCEL/g2W6SOTeMqYqbH38LliLLrKBibb8Uu+6taGEJM5ndx21o Vq7dCAWD6ooQFUBRLGN4PoEpUKahR1+dbB1JfbioeMX3RRU7wCN7FDxIwD78YRo66WSX gapUIlrRq+MPu9ZEHoSSS7Xl7kWJ7JlHatTdUhpK7fbldjXNWszN/JeA/cnpDbjyi15V oxpViRvihl8zq28zylaIRhaBCDCk9ASGtfZM6nGw1z0fk7O16uRL2LGS/cpwQguAJP11 NaSw== X-Forwarded-Encrypted: i=1; AJvYcCU99xjUteal06yVXnbP2bD+Ld92CVO8iHYnkwj3xuQaP8oh8OFXkP0dPW4F1EDXsxwzSr9Jv4gDqYZv2g==@vger.kernel.org, AJvYcCVusfczTG+QtI/wZKq737FG51JGlqAzDNq+mVYGJTEEVaUaiqq53+n11U5YEPEhoS5Q5NQDwpkrcnMTlAE9@vger.kernel.org, AJvYcCWJe3mgQL2decSuqnHzRfxEHcFv19VwRkc9Ut5TI7fJEXxbTY7CcszCdxoi6JOi73P2EXEpzoP4x+TY@vger.kernel.org, AJvYcCWj5pwMYAitRulCtM5bzkIEREIHZoqxI+U1E93PGhNUPqyNClqdOZW78j+6nRnpzYPlX3apFStn@vger.kernel.org, AJvYcCXE1mZ8Ij0p8g9/Y88N0mwCOt9zId9rLIaujErkyzBvSvNRHgYHb8FeUMd9SW4Jvk3E1LL+8yo2145Q@vger.kernel.org X-Gm-Message-State: AOJu0YyTPmDnXNWfUuY8zYmELCtx/gJNWqXRAZMgDwGsWdsTjWTHfoDN qu1yHypijXv6+9ck0+9ffhlq6csiQokWkRD7FS6zh7x34Jrj+3oj X-Gm-Gg: ASbGncu8Nat609eWRt1EaoSyTASho5jgNizWx54eOv2Xj5tEwczB/BdVHvAyQAFKOW8 rU6L6PO691CT6bHLrAjyhnTMOlXHmDdlQmTHfikb+vUnXQro1hoMsNYH90AaM0luYNvPgmfueem GPza2m/1WjWz5QKeAnOMHTDOM2U9VoS+urbCpG0FwyLFndEUCFQz/1FjvypQ+8DHklDUbLwNzdg vCrI3wBosSb2pELqvykz7anE4WRoHaQq/g6IiOO+mje5dS3CwbCE+hCzhLSEkochM5GBcy7zGFW r+JAXV1uon77nMyVk4tnWygR8I2p7QtWngML4hN+IAKUNdtz8AI= X-Google-Smtp-Source: AGHT+IHzqh5/8nNLCHt72i37fx00gCo6BGpf1nDqAKIYABAuhxZl3QM4MbQCBjDEBmiPRz62fUCoag== X-Received: by 2002:a05:651c:198c:b0:30b:b956:53e5 with SMTP id 38308e7fff4ca-30c4a8631b9mr75648671fa.12.1742226643535; Mon, 17 Mar 2025 08:50:43 -0700 (PDT) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30c3f0d2207sm16635501fa.14.2025.03.17.08.50.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 08:50:42 -0700 (PDT) Date: Mon, 17 Mar 2025 17:50:38 +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 v8 02/10] property: Add functions to iterate named child Message-ID: <9c3880f74476436f39d796b5c10c540ae50b722c.1742225817.git.mazziesaccount@gmail.com> References: Precedence: bulk X-Mailing-List: netdev@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: v7 => v8: - Fix the example in fwnode_get_named_child_node_count() documentation to use the fwnode_get_named_child_node_count() and not the device_get_named_child_node_count() - Fix the rest of the new macro's indentiations 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..f42f32ff45fc 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.:: + * fwnode_get_named_child_node_count(fwnode, "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..a1856e6b714c 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 Mon Mar 17 15:52:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 14019437 X-Patchwork-Delegate: kuba@kernel.org 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 625BB18EFD4; Mon, 17 Mar 2025 15:52:33 +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=1742226755; cv=none; b=Oz+kauonX8eUWdgr2wMRnsqAcVOVej/hfr8xmu2iNtfMQpb2unzSRL96jcWLw43KbS5qGf3kVv+dYV2w+wauuXqxW6JFn15055SG1YtGgZXxflUaBoRpIFy6c0YnFddKDGWTLu3IWwSWgMWV5fwLFUa1PgmK8p5Xg6TXbYPFvzg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742226755; c=relaxed/simple; bh=OGQkmyXOL35hKkBO69DLUu/I8HPGPktH92dHDZFr1ok=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=G5vujJG6DwsnFgiCGRGgtfbHU7NvzvH0vpZCa6Hbl/dp03RvZaGHrr9TP6TOVZPYh0pKR8CoYJdTQvOFDVXAc0ZC2SEGZYVGfAuwTho1VtrkYNgzK6yUkgbIrIL++eLcT4xdDgm6wYoMdQQgw7KhBbRLwPO+kxh2bYKIUG3HlD4= 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=h7yyAIfw; 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="h7yyAIfw" Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-30c461a45f8so38256161fa.1; Mon, 17 Mar 2025 08:52:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742226751; x=1742831551; 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=Bhq+kH+X05mUcX1Ap2GbPha12Vb9rFmptZREzPwZw0k=; b=h7yyAIfwTDXAJNZTQoIbNSrguGP4XQXl89VBPtp6y7wyQNqOr4UOuuGRvIUwtd4+HU lio6hSoWK27OG7z/3h/XBIVvi3b7T72G7dIv3jaxdrfTbh/iVpXetmJ+ETHeugp/iu4U b/QAui2OCHRIBLR2xTGQxlzMNMUJ8qLO86Pi9FBM5jBPXKS50wzb/D/x1nk3sd6kiJZn sBypg08MqBk4Jv6iFNznDQGJrZkCH5sZLldq0ArV+nVY2kH9Hod6yYAuObgA/JbA4u6L 4vR5gNL9WgD/Gs7GLf/C5FH3+Hb/wiNQlipI74UqixAJdHRuF8FMOKmvoU/6WcDcaNGk iBsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742226751; x=1742831551; 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=Bhq+kH+X05mUcX1Ap2GbPha12Vb9rFmptZREzPwZw0k=; b=Uy8VsqIEIlEmpxGcPddm5PM2JbmBJR5bTft7OGiz+NV+S++PfuSO41lcjpJQRD4iAv Dg+FAmJYYaM/mveGJcs3cu4GIrPoOrV8ciaS9GWHLL4hsTr7nMIw2liJvKIGFu2eFGXc vn5XlrTP+ETlJjq9ZpI5/FHbFLg3xmuk64+xPNPT40x5dpau7Xw8U8eorvTP8itd8uJN EtJljzgRfuT7koh5r0MT2w40u+VZDNwU7dGR1E5ANgXK9q+lNJsDplaR65ZcvBskFyHR nHCm36HYLZ6qWZGeVLTXgMIym1OwFZBj2Jjfof5bGNaZXHu/SWo0huhaESp8m2vE4cXe qxXw== X-Forwarded-Encrypted: i=1; AJvYcCVwFFuM9fG4hURz+9MKt1P5twD7I377IQbnACJKeurSLBi0U56kKwIle2Al7NsTpHgV+NLRG58ms1Cc@vger.kernel.org, AJvYcCX+HP0X3/mq4SsBNRR09ToboDNrlOVGaU1qXq/fYrmhMvDcOeEBPubUr5yVtsXfYiQ3RYiJisjS4ZXka8Z9@vger.kernel.org, AJvYcCXqiAEBYdgWhAhNFVlinw9OiVi89z4k4iyGLXbfBq984wGuwIJQVo8Aopnw5weANto6fiSbDCRy@vger.kernel.org X-Gm-Message-State: AOJu0YxgKUUFTvUqLbK3En96MFhLH1sJphBUdYkHNfNyeP3eDCVpq/ze exrlBExyTk4QGHB6Mc1cpg6ehiKRbS6sm5DfVbcfqRiQOFBhfVBP X-Gm-Gg: ASbGncvi6hLHYo3SdrsZRMdpbW0zApY4LUrItvC14GETAgaKmkA2gupqTySH8sFfTrV BnAWlMUw0v0l+3mFVItEYcKJEx8A2j4s5d7haEWXsZErb4/2XISI8BLhNrfJK8DX3cSbbn82kDQ i8WbyQ5S6JBNCzW6cyKgxb9ipRRvUFj02jcFyOIe1D0UrqbR9huST2tQKLpxqOxOt4/krjcICox g+KBFaSH54CNgRsUHDkKukf285zTnWxkrI9piiFyylsoXoVhamjpcc0tMwN2yJmE7i6RBeDRRJo fMwPwLmYEaA7qm5+KGcceiqftDK58ZAmkUecveinB/CRU7mpEmk= X-Google-Smtp-Source: AGHT+IGP8VDfLvdRHqupcyGY3jxaeZE5NMXtcA2RJMTkKbc2npNWVjBiXR6Dy5pmtZ78eWJwHB/b0w== X-Received: by 2002:a05:6512:3e17:b0:545:2a7f:8f79 with SMTP id 2adb3069b0e04-549c3902c47mr8375280e87.16.1742226751200; Mon, 17 Mar 2025 08:52:31 -0700 (PDT) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549ba8a8ec9sm1366286e87.236.2025.03.17.08.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 08:52:29 -0700 (PDT) Date: Mon, 17 Mar 2025 17:52:25 +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 net-next v8 09/10] net: gianfar: Use device_get_child_node_count_named() Message-ID: <95b6015cd5f6fcce535982118543d47504ed609f.1742225817.git.mazziesaccount@gmail.com> References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Patchwork-Delegate: kuba@kernel.org 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);