2020-12-07 17:49:57

by Rafael J. Wysocki

Subject: [PATCH] ACPI: scan: Fix up _DEP-related terminology with supplier/consumer

From: Rafael J. Wysocki <[email protected]>

The ACPI namespace scanning code uses the terms master/slave when
populating the list of _DEP dependencies, but that use has no
external exposures and is not mandated by nor associated with any
external specifications.

Change the language used through-out to supplier/consumer.

No functional impact.

Signed-off-by: Rafael J. Wysocki <[email protected]>
---
drivers/acpi/scan.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

Index: linux-pm/drivers/acpi/scan.c
===================================================================
--- linux-pm.orig/drivers/acpi/scan.c
+++ linux-pm/drivers/acpi/scan.c
@@ -51,8 +51,8 @@ static u64 spcr_uart_addr;

struct acpi_dep_data {
struct list_head node;
- acpi_handle master;
- acpi_handle slave;
+ acpi_handle supplier;
+ acpi_handle consumer;
};

void acpi_scan_lock_acquire(void)
@@ -1881,8 +1881,8 @@ static void acpi_device_dep_initialize(s
if (!dep)
return;

- dep->master = dep_devices.handles[i];
- dep->slave = adev->handle;
+ dep->supplier = dep_devices.handles[i];
+ dep->consumer = adev->handle;
adev->dep_unmet++;

mutex_lock(&acpi_dep_list_lock);
@@ -2058,8 +2058,8 @@ void acpi_walk_dep_device_list(acpi_hand

mutex_lock(&acpi_dep_list_lock);
list_for_each_entry_safe(dep, tmp, &acpi_dep_list, node) {
- if (dep->master == handle) {
- acpi_bus_get_device(dep->slave, &adev);
+ if (dep->supplier == handle) {
+ acpi_bus_get_device(dep->consumer, &adev);
if (!adev)
continue;

2020-12-07 18:27:39

by Hans de Goede

Subject: Re: [PATCH] ACPI: scan: Fix up _DEP-related terminology with supplier/consumer

Hi,

On 12/7/20 6:46 PM, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <[email protected]>
>
> The ACPI namespace scanning code uses the terms master/slave when
> populating the list of _DEP dependencies, but that use has no
> external exposures and is not mandated by nor associated with any
> external specifications.
>
> Change the language used through-out to supplier/consumer.
>
> No functional impact.
>
> Signed-off-by: Rafael J. Wysocki <[email protected]>

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <[email protected]>

Regards,

Hans



> ---
> drivers/acpi/scan.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> Index: linux-pm/drivers/acpi/scan.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/scan.c
> +++ linux-pm/drivers/acpi/scan.c
> @@ -51,8 +51,8 @@ static u64 spcr_uart_addr;
>
> struct acpi_dep_data {
> struct list_head node;
> - acpi_handle master;
> - acpi_handle slave;
> + acpi_handle supplier;
> + acpi_handle consumer;
> };
>
> void acpi_scan_lock_acquire(void)
> @@ -1881,8 +1881,8 @@ static void acpi_device_dep_initialize(s
> if (!dep)
> return;
>
> - dep->master = dep_devices.handles[i];
> - dep->slave = adev->handle;
> + dep->supplier = dep_devices.handles[i];
> + dep->consumer = adev->handle;
> adev->dep_unmet++;
>
> mutex_lock(&acpi_dep_list_lock);
> @@ -2058,8 +2058,8 @@ void acpi_walk_dep_device_list(acpi_hand
>
> mutex_lock(&acpi_dep_list_lock);
> list_for_each_entry_safe(dep, tmp, &acpi_dep_list, node) {
> - if (dep->master == handle) {
> - acpi_bus_get_device(dep->slave, &adev);
> + if (dep->supplier == handle) {
> + acpi_bus_get_device(dep->consumer, &adev);
> if (!adev)
> continue;
>
>
>
>