]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up driver.h patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Mar 2020 09:32:38 +0000 (10:32 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Mar 2020 09:32:44 +0000 (10:32 +0100)
queue-5.5/driver-core-add-dev_has_sync_state.patch

index 06c64a099aef838076d0829d2b1848a451d63479..d8448d0c36678a1c385fe0110016e3b17a7c68da 100644 (file)
@@ -21,9 +21,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/include/linux/device.h
 +++ b/include/linux/device.h
-@@ -797,6 +797,17 @@ extern void class_destroy(struct class *
-       __class_create(owner, name, &__key);    \
- })
+@@ -1522,6 +1522,17 @@ static inline struct device_node *dev_of
+ void driver_init(void);
  
 +static inline bool dev_has_sync_state(struct device *dev)
 +{
@@ -37,5 +37,5 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +}
 +
  /*
-  * The type of device, "struct device" is embedded in. A class
-  * or bus can contain devices of different types
+  * High level routines for use by the bus drivers
+  */