Revert "drivers: base: Fix device link removal"

This reverts commit d007150b4e which is
commit 80dd33cf72d1ab4f0af303f1fa242c6d6c8d328f upstream.

It breaks the abi and will be brought back at the proper time that we
can.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5b49602baf86e11e10eecb1c300ea8634826dbd2
This commit is contained in:
Greg Kroah-Hartman
2021-06-03 13:36:10 +02:00
parent c5d480cd47
commit 28e408cd4c
2 changed files with 18 additions and 25 deletions

View File

@@ -566,7 +566,7 @@ struct device {
* @flags: Link flags.
* @rpm_active: Whether or not the consumer device is runtime-PM-active.
* @kref: Count repeated addition of the same link.
* @rm_work: Work structure used for removing the link.
* @rcu_head: An RCU head to use for deferred execution of SRCU callbacks.
* @supplier_preactivated: Supplier has been made active before consumer probe.
*/
struct device_link {
@@ -579,7 +579,9 @@ struct device_link {
u32 flags;
refcount_t rpm_active;
struct kref kref;
struct work_struct rm_work;
#ifdef CONFIG_SRCU
struct rcu_head rcu_head;
#endif
bool supplier_preactivated; /* Owned by consumer probe. */
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);