add driver-core-remove-class_attr-usage.patch

2 files changed, 66 insertions, 0 deletions

diff --git a/driver-core-remove-class_attr-usage.patch b/driver-core-remove-class_attr-usage.patch
new file mode 100644
index 00000000000000..579885d665427f
--- /dev/null
+++ b/driver-core-remove-class_attr-usage.patch
@@ -0,0 +1,65 @@
+From foo@baz Tue Jun  6 15:26:21 CEST 2017
+Date: Tue, 06 Jun 2017 15:26:21 +0200
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: [PATCH] driver core: remove CLASS_ATTR usage
+
+There was only 2 remaining users of CLASS_ATTR() so let's finally get
+rid of them and force everyone to use the correct _RW/RO/WO versions
+instead.
+
+Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Cc: Paul Mackerras <paulus@samba.org>
+Cc: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/powerpc/platforms/pseries/dlpar.c    |    2 +-
+ arch/powerpc/platforms/pseries/mobility.c |    7 ++++---
+ include/linux/device.h                    |    2 --
+ 3 files changed, 5 insertions(+), 6 deletions(-)
+
+--- a/arch/powerpc/platforms/pseries/dlpar.c
++++ b/arch/powerpc/platforms/pseries/dlpar.c
+@@ -588,7 +588,7 @@ static ssize_t dlpar_show(struct class *
+ 	return sprintf(buf, "%s\n", "memory,cpu");
+ }
+ 
+-static CLASS_ATTR(dlpar, S_IWUSR | S_IRUSR, dlpar_show, dlpar_store);
++static CLASS_ATTR_RW(dlpar);
+ 
+ static int __init pseries_dlpar_init(void)
+ {
+--- a/arch/powerpc/platforms/pseries/mobility.c
++++ b/arch/powerpc/platforms/pseries/mobility.c
+@@ -349,8 +349,9 @@ void post_mobility_fixup(void)
+ 	return;
+ }
+ 
+-static ssize_t migrate_store(struct class *class, struct class_attribute *attr,
+-			     const char *buf, size_t count)
++static ssize_t migration_store(struct class *class,
++			       struct class_attribute *attr, const char *buf,
++			       size_t count)
+ {
+ 	u64 streamid;
+ 	int rc;
+@@ -380,7 +381,7 @@ static ssize_t migrate_store(struct clas
+  */
+ #define MIGRATION_API_VERSION	1
+ 
+-static CLASS_ATTR(migration, S_IWUSR, NULL, migrate_store);
++static CLASS_ATTR_WO(migration);
+ static CLASS_ATTR_STRING(api_version, S_IRUGO, __stringify(MIGRATION_API_VERSION));
+ 
+ static int __init mobility_sysfs_init(void)
+--- a/include/linux/device.h
++++ b/include/linux/device.h
+@@ -465,8 +465,6 @@ struct class_attribute {
+ 			const char *buf, size_t count);
+ };
+ 
+-#define CLASS_ATTR(_name, _mode, _show, _store) \
+-	struct class_attribute class_attr_##_name = __ATTR(_name, _mode, _show, _store)
+ #define CLASS_ATTR_RW(_name) \
+ 	struct class_attribute class_attr_##_name = __ATTR_RW(_name)
+ #define CLASS_ATTR_RO(_name) \
diff --git a/series b/series
index ae2fab5aaddee8..9dbc3c209dc3fc 100644
--- a/series
+++ b/series
@@ -1,4 +1,5 @@
 #
+driver-core-remove-class_attr-usage.patch
 tests-convert-the-membarrier-test-to-tap-format.patch
 lib-vsprintf-additional-kernel-pointer-filtering-options.patch
 lib-vsprintf-whitelist-stack-traces.patch