On Tuesday, June 30, 2015 04:55:04 PM Tomeu Vizoso wrote: > So fwnode_get_next_child_node() can be implemented for ACPI firmware > nodes. > > This re-implements acpi_get_next_child() in terms of > acpi_dev_get_next_child(). > > Signed-off-by: Tomeu Vizoso <tomeu.vizoso@xxxxxxxxxxxxx> Looks good to me. > --- > > drivers/acpi/scan.c | 5 ++--- > include/linux/acpi.h | 17 +++++++++++++++-- > 2 files changed, 17 insertions(+), 5 deletions(-) > > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c > index 2649a06..45cf1b7 100644 > --- a/drivers/acpi/scan.c > +++ b/drivers/acpi/scan.c > @@ -1482,10 +1482,9 @@ int acpi_device_add(struct acpi_device *device, > return result; > } > > -struct acpi_device *acpi_get_next_child(struct device *dev, > - struct acpi_device *child) > +struct acpi_device *acpi_dev_get_next_child(struct acpi_device *adev, > + struct acpi_device *child) > { > - struct acpi_device *adev = ACPI_COMPANION(dev); > struct list_head *head, *next; > > if (!adev) > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index fc84e42..2afcdb9 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -752,8 +752,14 @@ int acpi_dev_prop_read_single(struct acpi_device *adev, const char *propname, > int acpi_dev_prop_read(struct acpi_device *adev, const char *propname, > enum dev_prop_type proptype, void *val, size_t nval); > > -struct acpi_device *acpi_get_next_child(struct device *dev, > - struct acpi_device *child); > +struct acpi_device *acpi_dev_get_next_child(struct acpi_device *adev, > + struct acpi_device *child); > + > +static inline struct acpi_device *acpi_get_next_child(struct device *dev, > + struct acpi_device *child) > +{ > + return acpi_dev_get_next_child(ACPI_COMPANION(dev), child); > +} > #else > static inline int acpi_dev_get_property(struct acpi_device *adev, > const char *name, acpi_object_type type, > @@ -804,6 +810,13 @@ static inline struct acpi_device *acpi_get_next_child(struct device *dev, > return NULL; > } > > +static inline struct acpi_device *acpi_dev_get_next_child( > + struct acpi_device *adev, > + struct acpi_device *child) > +{ > + return NULL; > +} > + > static inline struct acpi_device *acpi_get_parent_dev(struct acpi_device *adev) > { > return NULL; > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html