diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-13 14:44:57 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-13 14:44:57 +0200 |
| commit | 5d2a3ca813f3d1dbebc39e8ad3f8ebd01b1ff627 (patch) | |
| tree | 58a26ff5809af1054078f7348e3c34fed94c52ae /include/linux/acpi.h | |
| parent | e4174ff78b9ec2179faeffe66640dbddce52b449 (diff) | |
| parent | 1e0cb59d5f0a41d1a2b7a1e7d45024fbac62d6e7 (diff) | |
Merge branch 'acpi-misc'
* acpi-misc:
ACPI: Make acpi_evaluate_dsm() prototype consistent
ACPI: wakeup: Remove dead ACPICA debug code
ACPI: video: Remove leftover ACPICA debug code
ACPI: tiny-power-button: Remove dead ACPICA debug code
ACPI: processor: Remove dead ACPICA debug code
ACPI: proc: Remove dead ACPICA debug code
ACPI: PCI: Remove unused ACPICA debug code
ACPI: event: Remove leftover ACPICA debug code
ACPI: dock: Remove dead ACPICA debug code
ACPI: debugfs: Remove dead ACPICA debug code
ACPI: custom_method: Remove dead ACPICA debug code
ACPI: container: Remove leftover ACPICA debug functionality
ACPI: platform: Remove ACPI_MODULE_NAME()
ACPI: memhotplug: Remove leftover ACPICA debug functionality
ACPI: LPSS: Remove ACPI_MODULE_NAME()
ACPI: cmos_rtc: Remove leftover ACPI_MODULE_NAME()
ACPI: Remove three unused inline functions
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d81ec3000e95..d02179be17d1 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -865,7 +865,7 @@ static inline bool acpi_driver_match_device(struct device *dev, static inline union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const guid_t *guid, - int rev, int func, + u64 rev, u64 func, union acpi_object *argv4) { return NULL; @@ -977,8 +977,6 @@ int acpi_subsys_runtime_suspend(struct device *dev); int acpi_subsys_runtime_resume(struct device *dev); int acpi_dev_pm_attach(struct device *dev, bool power_on); #else -static inline int acpi_dev_runtime_suspend(struct device *dev) { return 0; } -static inline int acpi_dev_runtime_resume(struct device *dev) { return 0; } static inline int acpi_subsys_runtime_suspend(struct device *dev) { return 0; } static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; } static inline int acpi_dev_pm_attach(struct device *dev, bool power_on) @@ -1216,13 +1214,6 @@ static inline int acpi_node_prop_get(const struct fwnode_handle *fwnode, return -ENXIO; } -static inline int acpi_dev_prop_get(const struct acpi_device *adev, - const char *propname, - void **valptr) -{ - return -ENXIO; -} - static inline int acpi_dev_prop_read_single(const struct acpi_device *adev, const char *propname, enum dev_prop_type proptype, |