diff options
| author | Petr Mladek <pmladek@suse.com> | 2026-04-20 14:41:28 +0300 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2026-04-20 14:41:28 +0300 |
| commit | 3e9e952bb3139ad1e08f3e1960239c2988ab90c9 (patch) | |
| tree | ee27c846e06879bc062388cf948086caeda676cf /include/linux/device | |
| parent | aea645c02f1acc36088618667e086b62d8f83e92 (diff) | |
| parent | 8901ac9d2c7eb8ed7ae5e749bf13ecb3b6062488 (diff) | |
| download | linux-3e9e952bb3139ad1e08f3e1960239c2988ab90c9.tar.xz | |
Merge branch 'for-7.1-printf-kunit-build' into for-linus
Diffstat (limited to 'include/linux/device')
| -rw-r--r-- | include/linux/device/bus.h | 4 | ||||
| -rw-r--r-- | include/linux/device/devres.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/device/bus.h b/include/linux/device/bus.h index 99b1002b3e31..99c3c83ea520 100644 --- a/include/linux/device/bus.h +++ b/include/linux/device/bus.h @@ -215,9 +215,9 @@ bus_find_next_device(const struct bus_type *bus,struct device *cur) return bus_find_device(bus, cur, NULL, device_match_any); } -#ifdef CONFIG_ACPI struct acpi_device; +#ifdef CONFIG_ACPI /** * bus_find_device_by_acpi_dev : device iterator for locating a particular device * matching the ACPI COMPANION device. @@ -231,7 +231,7 @@ bus_find_device_by_acpi_dev(const struct bus_type *bus, const struct acpi_device } #else static inline struct device * -bus_find_device_by_acpi_dev(const struct bus_type *bus, const void *adev) +bus_find_device_by_acpi_dev(const struct bus_type *bus, const struct acpi_device *adev) { return NULL; } diff --git a/include/linux/device/devres.h b/include/linux/device/devres.h index 9c1e3d643d69..14ab9159bdda 100644 --- a/include/linux/device/devres.h +++ b/include/linux/device/devres.h @@ -26,10 +26,6 @@ __devres_alloc_node(dr_release_t release, size_t size, gfp_t gfp, int nid, const #define devres_alloc_node(release, size, gfp, nid) \ __devres_alloc_node(release, size, gfp, nid, #release) -void devres_for_each_res(struct device *dev, dr_release_t release, - dr_match_t match, void *match_data, - void (*fn)(struct device *, void *, void *), - void *data); void devres_free(void *res); void devres_add(struct device *dev, void *res); void *devres_find(struct device *dev, dr_release_t release, dr_match_t match, void *match_data); |