hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9QG3P
-----------------------------------
Move the device_link_wait_removal() to the of.h to avoid kabi broken.
Fixes: 6c72a794b8ae ("of: dynamic: Synchronize of_changeset_destroy() with the devlink removals") Signed-off-by: Zhang Zekun zhangzekun11@huawei.com --- drivers/of/dynamic.c | 1 - include/linux/device.h | 1 - include/linux/of.h | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index 4d80167d39d4..e663445ce085 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -9,7 +9,6 @@
#define pr_fmt(fmt) "OF: " fmt
-#include <linux/device.h> #include <linux/of.h> #include <linux/spinlock.h> #include <linux/slab.h> diff --git a/include/linux/device.h b/include/linux/device.h index ceb02c0ac69c..62b127bffdda 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -962,7 +962,6 @@ void device_link_del(struct device_link *link); void device_link_remove(void *consumer, struct device *supplier); void device_links_supplier_sync_state_pause(void); void device_links_supplier_sync_state_resume(void); -void device_link_wait_removal(void);
extern __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); diff --git a/include/linux/of.h b/include/linux/of.h index e6b8e39f524c..1ebea14ad39c 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1451,6 +1451,8 @@ static inline int of_reconfig_get_state_change(unsigned long action, } #endif /* CONFIG_OF_DYNAMIC */
+void device_link_wait_removal(void); + /** * of_device_is_system_power_controller - Tells if system-power-controller is found for device_node * @np: Pointer to the given device_node