Offering: HULK hulk inclusion category: bugfix bugzilla: NA This reverts commit 308a322bb1dbeb7b9e0ad3430cfee4d818303d67. Fixes: 308a322bb1db ("driver/core: Fix kabi broken of platform_device/device/bus_type") Signed-off-by: Lin Ruifeng <linruifeng4@huawei.com> --- include/linux/device.h | 15 +++++---------- include/linux/platform_device.h | 6 ------ 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/include/linux/device.h b/include/linux/device.h index 5bc8548486fe..f6aef1f7171e 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -147,10 +147,8 @@ struct bus_type { struct subsys_private *p; struct lock_class_key lock_key; - bool need_parent_lock; -#ifndef __GENKSYMS__ bool driver_override; -#endif + bool need_parent_lock; }; extern int __must_check bus_register(struct bus_type *bus); @@ -1007,6 +1005,10 @@ struct device { core doesn't touch it */ void *driver_data; /* Driver data, set and get with dev_set/get_drvdata */ + struct { + const char *name; + spinlock_t lock; + } driver_override; struct dev_links_info links; struct dev_pm_info power; struct dev_pm_domain *pm_domain; @@ -1099,15 +1101,8 @@ struct device { #else KABI_RESERVE(2) #endif -#ifndef __GENKSYMS__ - struct { - const char *name; - spinlock_t lock; - } driver_override; -#else KABI_RESERVE(3) KABI_RESERVE(4) -#endif KABI_RESERVE(5) KABI_RESERVE(6) KABI_RESERVE(7) diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 5a2db0dc1ac1..eef1e77eb43b 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -30,12 +30,6 @@ struct platform_device { const struct platform_device_id *id_entry; -#ifndef __GENKSYMS__ - char *kabi_reserved_driver_override; -#else - char *driver_override; -#endif - /* MFD cell pointer */ struct mfd_cell *mfd_cell; -- 2.43.0