diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-30 00:57:51 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-30 00:57:51 +0300 |
| commit | 3431e490b50356b56084305a2e93b3a980802b22 (patch) | |
| tree | da5213c3c05df56711a097c95e8a1410a46df78d /drivers/acpi/internal.h | |
| parent | 5af310a8ee70dd6a588c8ee1d4487a230a7b7b65 (diff) | |
| parent | 1dcc3d3362b0c97e48290f7786be85b4cec2a147 (diff) | |
| download | linux-3431e490b50356b56084305a2e93b3a980802b22.tar.xz | |
Merge branch 'acpi-scan' into acpi-pm
Conflicts:
drivers/acpi/scan.c
The conflict is resolved by moving the just introduced
acpi_device_is_first_physical_node() to bus.c and using
the existing acpi_companion_match() from there.
There will be an additional commit to combine the two.
Diffstat (limited to 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index f6aefe984941..df7f7aff327b 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -93,6 +93,8 @@ int acpi_device_add(struct acpi_device *device, void (*release)(struct device *)); void acpi_init_device_object(struct acpi_device *device, acpi_handle handle, int type, unsigned long long sta); +int acpi_device_setup_files(struct acpi_device *dev); +void acpi_device_remove_files(struct acpi_device *dev); void acpi_device_add_finalize(struct acpi_device *device); void acpi_free_pnp_ids(struct acpi_device_pnp *pnp); bool acpi_device_is_present(struct acpi_device *adev); @@ -101,6 +103,13 @@ bool acpi_device_is_first_physical_node(struct acpi_device *adev, const struct device *dev); /* -------------------------------------------------------------------------- + Device Matching and Notification + -------------------------------------------------------------------------- */ +struct acpi_device *acpi_companion_match(const struct device *dev); +int __acpi_device_uevent_modalias(struct acpi_device *adev, + struct kobj_uevent_env *env); + +/* -------------------------------------------------------------------------- Power Resource -------------------------------------------------------------------------- */ int acpi_power_init(void); |