diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-04-08 19:50:44 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-04-08 19:50:44 +0200 |
| commit | 87ad236001eb95cf1760ccaf7670c94722231097 (patch) | |
| tree | e746f9a1b7366fbc4945399724fbc28a0b76d342 | |
| parent | dfbba2518aac4204203b0697a894d3b2f80134d3 (diff) | |
| parent | ac2a3feefad549814f5e7cca30be07a255c8494a (diff) | |
Merge branch 'acpi-bus'acpi-5.18-rc2
* acpi-bus:
ACPI: bus: Eliminate acpi_bus_get_device()
| -rw-r--r-- | drivers/acpi/scan.c | 13 | ||||
| -rw-r--r-- | drivers/spi/spi.c | 3 | ||||
| -rw-r--r-- | include/acpi/acpi_bus.h | 1 |
3 files changed, 2 insertions, 15 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 9efbfe087de7..762b61f67e6c 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -588,19 +588,6 @@ static struct acpi_device *handle_to_device(acpi_handle handle, return adev; } -int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device) -{ - if (!device) - return -EINVAL; - - *device = handle_to_device(handle, NULL); - if (!*device) - return -ENODEV; - - return 0; -} -EXPORT_SYMBOL(acpi_bus_get_device); - /** * acpi_fetch_acpi_dev - Retrieve ACPI device object. * @handle: ACPI handle associated with the requested ACPI device object. diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index c4dd1200fe99..9bb5400af205 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2406,7 +2406,8 @@ static int acpi_spi_add_resource(struct acpi_resource *ares, void *data) } else { struct acpi_device *adev; - if (acpi_bus_get_device(parent_handle, &adev)) + adev = acpi_fetch_acpi_dev(parent_handle); + if (!adev) return -ENODEV; ctlr = acpi_spi_find_controller_by_adev(adev); diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 3f7f01f03869..c4b78c21d793 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -509,7 +509,6 @@ extern int unregister_acpi_notifier(struct notifier_block *); * External Functions */ -int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device); struct acpi_device *acpi_fetch_acpi_dev(acpi_handle handle); acpi_status acpi_bus_get_status_handle(acpi_handle handle, unsigned long long *sta); |