[PATCH v2 01/16] ACPI: property: Make acpi_get_next_subnode() static

Sakari Ailus posted 16 patches 1 week ago
[PATCH v2 01/16] ACPI: property: Make acpi_get_next_subnode() static
Posted by Sakari Ailus 1 week ago
acpi_get_next_subnode() is only used in drivers/acpi/property.c. Remove
its prototype from include/linux/acpi.h and make it static.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/acpi/property.c |  5 +++--
 include/linux/acpi.h    | 10 ----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index 436019d96027..5435628c67e7 100644
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -1264,8 +1264,9 @@ static int stop_on_next(struct acpi_device *adev, void *data)
  * @fwnode: Firmware node to find the next child node for.
  * @child: Handle to one of the device's child nodes or a null handle.
  */
-struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode,
-					    struct fwnode_handle *child)
+static struct fwnode_handle *
+acpi_get_next_subnode(const struct fwnode_handle *fwnode,
+		      struct fwnode_handle *child)
 {
 	struct acpi_device *adev = to_acpi_device_node(fwnode);
 
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 5ff5d99f6ead..703323b9fe0c 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -1349,9 +1349,6 @@ acpi_data_add_props(struct acpi_device_data *data, const guid_t *guid,
 int acpi_node_prop_get(const struct fwnode_handle *fwnode, const char *propname,
 		       void **valptr);
 
-struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode,
-					    struct fwnode_handle *child);
-
 struct acpi_probe_entry;
 typedef bool (*acpi_probe_entry_validate_subtbl)(struct acpi_subtable_header *,
 						 struct acpi_probe_entry *);
@@ -1450,13 +1447,6 @@ static inline int acpi_node_prop_get(const struct fwnode_handle *fwnode,
 	return -ENXIO;
 }
 
-static inline struct fwnode_handle *
-acpi_get_next_subnode(const struct fwnode_handle *fwnode,
-		      struct fwnode_handle *child)
-{
-	return NULL;
-}
-
 static inline struct fwnode_handle *
 acpi_graph_get_next_endpoint(const struct fwnode_handle *fwnode,
 			     struct fwnode_handle *prev)
-- 
2.47.3
Re: [PATCH v2 01/16] ACPI: property: Make acpi_get_next_subnode() static
Posted by Jonathan Cameron 2 days, 17 hours ago
On Wed, 24 Sep 2025 10:45:47 +0300
Sakari Ailus <sakari.ailus@linux.intel.com> wrote:

> acpi_get_next_subnode() is only used in drivers/acpi/property.c. Remove
> its prototype from include/linux/acpi.h and make it static.
> 
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Re: [PATCH v2 01/16] ACPI: property: Make acpi_get_next_subnode() static
Posted by Laurent Pinchart 1 week ago
Hi Sakari,

Thank you for the patch.

On Wed, Sep 24, 2025 at 10:45:47AM +0300, Sakari Ailus wrote:
> acpi_get_next_subnode() is only used in drivers/acpi/property.c. Remove
> its prototype from include/linux/acpi.h and make it static.
> 
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

> ---
>  drivers/acpi/property.c |  5 +++--
>  include/linux/acpi.h    | 10 ----------
>  2 files changed, 3 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
> index 436019d96027..5435628c67e7 100644
> --- a/drivers/acpi/property.c
> +++ b/drivers/acpi/property.c
> @@ -1264,8 +1264,9 @@ static int stop_on_next(struct acpi_device *adev, void *data)
>   * @fwnode: Firmware node to find the next child node for.
>   * @child: Handle to one of the device's child nodes or a null handle.
>   */
> -struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode,
> -					    struct fwnode_handle *child)
> +static struct fwnode_handle *
> +acpi_get_next_subnode(const struct fwnode_handle *fwnode,
> +		      struct fwnode_handle *child)
>  {
>  	struct acpi_device *adev = to_acpi_device_node(fwnode);
>  
> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> index 5ff5d99f6ead..703323b9fe0c 100644
> --- a/include/linux/acpi.h
> +++ b/include/linux/acpi.h
> @@ -1349,9 +1349,6 @@ acpi_data_add_props(struct acpi_device_data *data, const guid_t *guid,
>  int acpi_node_prop_get(const struct fwnode_handle *fwnode, const char *propname,
>  		       void **valptr);
>  
> -struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode,
> -					    struct fwnode_handle *child);
> -
>  struct acpi_probe_entry;
>  typedef bool (*acpi_probe_entry_validate_subtbl)(struct acpi_subtable_header *,
>  						 struct acpi_probe_entry *);
> @@ -1450,13 +1447,6 @@ static inline int acpi_node_prop_get(const struct fwnode_handle *fwnode,
>  	return -ENXIO;
>  }
>  
> -static inline struct fwnode_handle *
> -acpi_get_next_subnode(const struct fwnode_handle *fwnode,
> -		      struct fwnode_handle *child)
> -{
> -	return NULL;
> -}
> -
>  static inline struct fwnode_handle *
>  acpi_graph_get_next_endpoint(const struct fwnode_handle *fwnode,
>  			     struct fwnode_handle *prev)

-- 
Regards,

Laurent Pinchart
Re: [PATCH v2 01/16] ACPI: property: Make acpi_get_next_subnode() static
Posted by Laurent Pinchart 1 week ago
On Wed, Sep 24, 2025 at 12:27:53PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
> 
> Thank you for the patch.
> 
> On Wed, Sep 24, 2025 at 10:45:47AM +0300, Sakari Ailus wrote:
> > acpi_get_next_subnode() is only used in drivers/acpi/property.c. Remove
> > its prototype from include/linux/acpi.h and make it static.
> > 
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> 
> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> > ---
> >  drivers/acpi/property.c |  5 +++--
> >  include/linux/acpi.h    | 10 ----------
> >  2 files changed, 3 insertions(+), 12 deletions(-)
> > 
> > diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
> > index 436019d96027..5435628c67e7 100644
> > --- a/drivers/acpi/property.c
> > +++ b/drivers/acpi/property.c
> > @@ -1264,8 +1264,9 @@ static int stop_on_next(struct acpi_device *adev, void *data)
> >   * @fwnode: Firmware node to find the next child node for.
> >   * @child: Handle to one of the device's child nodes or a null handle.
> >   */

I missed this, I'd turn /** into /* here as the function is now static.

> > -struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode,
> > -					    struct fwnode_handle *child)
> > +static struct fwnode_handle *
> > +acpi_get_next_subnode(const struct fwnode_handle *fwnode,
> > +		      struct fwnode_handle *child)
> >  {
> >  	struct acpi_device *adev = to_acpi_device_node(fwnode);
> >  
> > diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> > index 5ff5d99f6ead..703323b9fe0c 100644
> > --- a/include/linux/acpi.h
> > +++ b/include/linux/acpi.h
> > @@ -1349,9 +1349,6 @@ acpi_data_add_props(struct acpi_device_data *data, const guid_t *guid,
> >  int acpi_node_prop_get(const struct fwnode_handle *fwnode, const char *propname,
> >  		       void **valptr);
> >  
> > -struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode,
> > -					    struct fwnode_handle *child);
> > -
> >  struct acpi_probe_entry;
> >  typedef bool (*acpi_probe_entry_validate_subtbl)(struct acpi_subtable_header *,
> >  						 struct acpi_probe_entry *);
> > @@ -1450,13 +1447,6 @@ static inline int acpi_node_prop_get(const struct fwnode_handle *fwnode,
> >  	return -ENXIO;
> >  }
> >  
> > -static inline struct fwnode_handle *
> > -acpi_get_next_subnode(const struct fwnode_handle *fwnode,
> > -		      struct fwnode_handle *child)
> > -{
> > -	return NULL;
> > -}
> > -
> >  static inline struct fwnode_handle *
> >  acpi_graph_get_next_endpoint(const struct fwnode_handle *fwnode,
> >  			     struct fwnode_handle *prev)

-- 
Regards,

Laurent Pinchart