aboutsummaryrefslogtreecommitdiffstats
path: root/d99.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-16 16:38:47 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-16 16:38:47 +0100
commit137d9a2caad76b7ebfa137a3629e6ee2d77a006f (patch)
tree114b5b229745ba816face035b3bbd91ca692b418 /d99.patch
parent6680ebc7a39c4a9661004adb6c8f4abc98fa6322 (diff)
downloadpatches-137d9a2caad76b7ebfa137a3629e6ee2d77a006f.tar.gz
updates
Diffstat (limited to 'd99.patch')
-rw-r--r--d99.patch37
1 files changed, 35 insertions, 2 deletions
diff --git a/d99.patch b/d99.patch
index b3d1f6cd46f37b..861c5a1ebc1403 100644
--- a/d99.patch
+++ b/d99.patch
@@ -12,10 +12,43 @@ one can use it anymore.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
- include/linux/device.h | 2 --
- 1 file changed, 2 deletions(-)
+ Documentation/driver-model/driver.txt | 7 ++++---
+ Documentation/filesystems/sysfs.txt | 3 ++-
+ include/linux/device.h | 2 --
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+--- a/Documentation/driver-model/driver.txt
++++ b/Documentation/driver-model/driver.txt
+@@ -196,12 +196,13 @@ struct driver_attribute {
+ };
+
+ Device drivers can export attributes via their sysfs directories.
+-Drivers can declare attributes using a DRIVER_ATTR macro that works
+-identically to the DEVICE_ATTR macro.
++Drivers can declare attributes using a DRIVER_ATTR_RW and DRIVER_ATTR_RO
++macro that works identically to the DEVICE_ATTR_RW and DEVICE_ATTR_RO
++macros.
+
+ Example:
+
+-DRIVER_ATTR(debug,0644,show_debug,store_debug);
++DRIVER_ATTR_RW(debug);
+
+ This is equivalent to declaring:
+
+--- a/Documentation/filesystems/sysfs.txt
++++ b/Documentation/filesystems/sysfs.txt
+@@ -366,7 +366,8 @@ struct driver_attribute {
+
+ Declaring:
+
+-DRIVER_ATTR(_name, _mode, _show, _store)
++DRIVER_ATTR_RO(_name)
++DRIVER_ATTR_RW(_name)
+
+ Creation/Removal:
+
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -303,8 +303,6 @@ struct driver_attribute {