diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-05 12:32:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-05 12:32:17 -0800 |
| commit | ea6be461cbedefaa881711a43f2842aabbd12fd4 (patch) | |
| tree | 5952d3156e3a1cba245bccda6cf7096f864d6d2c | |
| parent | fc2c8d0af05af4c380824e40ff99ede398913ae5 (diff) | |
| parent | ff70784ab9f89e78e67d5d172bf7644de673f61f (diff) | |
| download | linux-ea6be461cbedefaa881711a43f2842aabbd12fd4.tar.bz2 | |
Merge tag 'acpi-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"Make the empty stubs of some helper functions used when CONFIG_ACPI is
not set actually match those functions (Andy Shevchenko)"
* tag 'acpi-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: bus: Constify is_acpi_node() and friends (part 2)
| -rw-r--r-- | include/linux/acpi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 3c5757d539ab..9f432411e988 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -746,12 +746,12 @@ acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv) static inline void acpi_dev_put(struct acpi_device *adev) {} -static inline bool is_acpi_node(struct fwnode_handle *fwnode) +static inline bool is_acpi_node(const struct fwnode_handle *fwnode) { return false; } -static inline bool is_acpi_device_node(struct fwnode_handle *fwnode) +static inline bool is_acpi_device_node(const struct fwnode_handle *fwnode) { return false; } @@ -761,7 +761,7 @@ static inline struct acpi_device *to_acpi_device_node(struct fwnode_handle *fwno return NULL; } -static inline bool is_acpi_data_node(struct fwnode_handle *fwnode) +static inline bool is_acpi_data_node(const struct fwnode_handle *fwnode) { return false; } |