diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-09-03 19:09:22 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-09-09 18:07:59 +0200 |
| commit | dc2447880b728993a40881bf4ad482dbb93c14f2 (patch) | |
| tree | 64b86a8014a2813b04ee6093a658566565017c56 | |
| parent | 811268084ef2f9ead128c3d31b5b646510b7c180 (diff) | |
| download | linux-next-dc2447880b728993a40881bf4ad482dbb93c14f2.tar.gz linux-next-dc2447880b728993a40881bf4ad482dbb93c14f2.zip | |
ACPI: scan: Combine two conditionals in acpi_bus_attach()
There are two conditionals in acpi_bus_attach() that can be combined,
which slightly reduces the overhead and makes the code a bit easier
to follow, so do that.
No intentional functional impact.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Peixin Xie <peixin.xie@linux.spacemit.com>
Tested-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Link: https://patch.msgid.link/8746939.T7Z3S40VBb@rafael.j.wysocki
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/acpi/scan.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 13d1e77c9973..30bfef67cbaa 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -2386,13 +2386,8 @@ static int acpi_bus_attach(struct acpi_device *device, void *first_pass) if (ret < 0) return 0; - if (ret > 0 && !device->flags.enumeration_by_parent) { - acpi_device_set_enumerated(device); - goto ok; - } - - if (device->pnp.type.platform_id || device->pnp.type.backlight || - device->flags.enumeration_by_parent) + if (device->flags.enumeration_by_parent || + (!ret && (device->pnp.type.platform_id || device->pnp.type.backlight))) acpi_default_enumeration(device); else acpi_device_set_enumerated(device); |