diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2019-03-25 14:34:02 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-03-26 17:36:46 -0400 |
commit | 40381a3c1fa3ed37458c7f745e51fc81e9b48fe2 (patch) | |
tree | 2d3c15f2673ca3aa27f1e4983bb59b122805693a | |
parent | 8c2ffd9174779014c3fe1f96d9dc3641d9175f00 (diff) |
ACPI / scan: Simplify acpi_bus_extract_wakeup_device_power_package()
acpi_bus_extract_wakeup_device_power_package() is a static function
with a single caller that supplies (device->handle, &device->wakeup).
Simplify the interface so the caller need only supply "device".
This makes it obvious that "wakeup", i.e., &device->wakeup, can never
be NULL, so remove the unnecessary check for that.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | drivers/acpi/scan.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 446c959a8f08..f3fb1fa79429 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -763,18 +763,16 @@ acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd) | |||
763 | } | 763 | } |
764 | EXPORT_SYMBOL_GPL(acpi_bus_get_ejd); | 764 | EXPORT_SYMBOL_GPL(acpi_bus_get_ejd); |
765 | 765 | ||
766 | static int acpi_bus_extract_wakeup_device_power_package(acpi_handle handle, | 766 | static int acpi_bus_extract_wakeup_device_power_package(struct acpi_device *dev) |
767 | struct acpi_device_wakeup *wakeup) | ||
768 | { | 767 | { |
768 | acpi_handle handle = dev->handle; | ||
769 | struct acpi_device_wakeup *wakeup = &dev->wakeup; | ||
769 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | 770 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; |
770 | union acpi_object *package = NULL; | 771 | union acpi_object *package = NULL; |
771 | union acpi_object *element = NULL; | 772 | union acpi_object *element = NULL; |
772 | acpi_status status; | 773 | acpi_status status; |
773 | int err = -ENODATA; | 774 | int err = -ENODATA; |
774 | 775 | ||
775 | if (!wakeup) | ||
776 | return -EINVAL; | ||
777 | |||
778 | INIT_LIST_HEAD(&wakeup->resources); | 776 | INIT_LIST_HEAD(&wakeup->resources); |
779 | 777 | ||
780 | /* _PRW */ | 778 | /* _PRW */ |
@@ -883,8 +881,7 @@ static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device) | |||
883 | if (!acpi_has_method(device->handle, "_PRW")) | 881 | if (!acpi_has_method(device->handle, "_PRW")) |
884 | return; | 882 | return; |
885 | 883 | ||
886 | err = acpi_bus_extract_wakeup_device_power_package(device->handle, | 884 | err = acpi_bus_extract_wakeup_device_power_package(device); |
887 | &device->wakeup); | ||
888 | if (err) { | 885 | if (err) { |
889 | dev_err(&device->dev, "_PRW evaluation error: %d\n", err); | 886 | dev_err(&device->dev, "_PRW evaluation error: %d\n", err); |
890 | return; | 887 | return; |