diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-14 13:59:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-14 13:59:04 +0200 |
| commit | 5a7f345ba5e849229317f73497a17637c9a08e4a (patch) | |
| tree | 4d7661b70e4da95d2acfddce1ba76b7b3190cd3f /c07.patch | |
| parent | 1670862cd60c9110a93d8fdd186d4bfe51b185d1 (diff) | |
| download | patches-5a7f345ba5e849229317f73497a17637c9a08e4a.tar.gz | |
get a bunch of stuff finally upstream.
Diffstat (limited to 'c07.patch')
| -rw-r--r-- | c07.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/c07.patch b/c07.patch deleted file mode 100644 index 7f95a5aa87aaca..00000000000000 --- a/c07.patch +++ /dev/null @@ -1,53 +0,0 @@ -From foo@baz Tue Jun 6 14:48:22 CEST 2017 -Date: Tue, 06 Jun 2017 14:48:22 +0200 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: gpio: use class_groups instead of class_attrs - -The class_attrs pointer is long depreciated, and is about to be finally -removed, so move to use the class_groups pointer instead. - -Cc: Linus Walleij <linus.walleij@linaro.org> -Cc: Alexandre Courbot <gnurou@gmail.com> -Cc: <linux-gpio@vger.kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/gpio/gpiolib-sysfs.c | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - ---- a/drivers/gpio/gpiolib-sysfs.c -+++ b/drivers/gpio/gpiolib-sysfs.c -@@ -479,6 +479,7 @@ done: - pr_debug("%s: status %d\n", __func__, status); - return status ? : len; - } -+static CLASS_ATTR_WO(export); - - static ssize_t unexport_store(struct class *class, - struct class_attribute *attr, -@@ -514,18 +515,20 @@ done: - pr_debug("%s: status %d\n", __func__, status); - return status ? : len; - } -+static CLASS_ATTR_WO(unexport); - --static struct class_attribute gpio_class_attrs[] = { -- __ATTR(export, 0200, NULL, export_store), -- __ATTR(unexport, 0200, NULL, unexport_store), -- __ATTR_NULL, -+static struct attribute *gpio_class_attrs[] = { -+ &class_attr_export.attr, -+ &class_attr_unexport.attr, -+ NULL, - }; -+ATTRIBUTE_GROUPS(gpio_class); - - static struct class gpio_class = { - .name = "gpio", - .owner = THIS_MODULE, - -- .class_attrs = gpio_class_attrs, -+ .class_groups = gpio_class_groups, - }; - - |