On Tue, Feb 22, 2022 at 08:51:42PM +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
>
> In order to avoid exposing acpi_bus_type to modules, introduce an
> acpi_bus_for_each_dev() helper for iterating over all ACPI device
> objects and make typec_link_ports() use it instead of the raw
> bus_for_each_dev() along with acpi_bus_type.
>
> Having done that, drop the acpi_bus_type export.
>
> No intentional functional impact.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
FWIW:
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> drivers/acpi/bus.c | 7 ++++++-
> drivers/usb/typec/port-mapper.c | 2 +-
> include/acpi/acpi_bus.h | 2 ++
> 3 files changed, 9 insertions(+), 2 deletions(-)
>
> Index: linux-pm/drivers/acpi/bus.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/bus.c
> +++ linux-pm/drivers/acpi/bus.c
> @@ -1043,7 +1043,12 @@ struct bus_type acpi_bus_type = {
> .remove = acpi_device_remove,
> .uevent = acpi_device_uevent,
> };
> -EXPORT_SYMBOL_GPL(acpi_bus_type);
> +
> +int acpi_bus_for_each_dev(int (*fn)(struct device *, void *), void *data)
> +{
> + return bus_for_each_dev(&acpi_bus_type, NULL, data, fn);
> +}
> +EXPORT_SYMBOL_GPL(acpi_bus_for_each_dev);
>
> /* --------------------------------------------------------------------------
> Initialization/Cleanup
> Index: linux-pm/include/acpi/acpi_bus.h
> ===================================================================
> --- linux-pm.orig/include/acpi/acpi_bus.h
> +++ linux-pm/include/acpi/acpi_bus.h
> @@ -480,6 +480,8 @@ void acpi_initialize_hp_context(struct a
> /* acpi_device.dev.bus == &acpi_bus_type */
> extern struct bus_type acpi_bus_type;
>
> +int acpi_bus_for_each_dev(int (*fn)(struct device *, void *), void *data);
> +
> /*
> * Events
> * ------
> Index: linux-pm/drivers/usb/typec/port-mapper.c
> ===================================================================
> --- linux-pm.orig/drivers/usb/typec/port-mapper.c
> +++ linux-pm/drivers/usb/typec/port-mapper.c
> @@ -59,7 +59,7 @@ int typec_link_ports(struct typec_port *
> if (!has_acpi_companion(&con->dev))
> return 0;
>
> - bus_for_each_dev(&acpi_bus_type, NULL, &arg, typec_port_match);
> + acpi_bus_for_each_dev(typec_port_match, &arg);
> if (!arg.match)
> return 0;
>
>
>
--
heikki
