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 /c05.patch | |
| parent | 1670862cd60c9110a93d8fdd186d4bfe51b185d1 (diff) | |
| download | patches-5a7f345ba5e849229317f73497a17637c9a08e4a.tar.gz | |
get a bunch of stuff finally upstream.
Diffstat (limited to 'c05.patch')
| -rw-r--r-- | c05.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/c05.patch b/c05.patch deleted file mode 100644 index 3c26a6de03c4bb..00000000000000 --- a/c05.patch +++ /dev/null @@ -1,58 +0,0 @@ -From foo@baz Tue Jun 6 14:48:10 CEST 2017 -Date: Tue, 06 Jun 2017 14:48:10 +0200 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: mtd: 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: Artem Bityutskiy <dedekind1@gmail.com> -Cc: Richard Weinberger <richard@nod.at> -Cc: David Woodhouse <dwmw2@infradead.org> -Cc: Brian Norris <computersforpeace@gmail.com> -Cc: Boris Brezillon <boris.brezillon@free-electrons.com> -Cc: Marek Vasut <marek.vasut@gmail.com> -Cc: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr> -Cc: <linux-mtd@lists.infradead.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - ---- - drivers/mtd/ubi/build.c | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - ---- a/drivers/mtd/ubi/build.c -+++ b/drivers/mtd/ubi/build.c -@@ -104,23 +104,25 @@ DEFINE_MUTEX(ubi_devices_mutex); - static DEFINE_SPINLOCK(ubi_devices_lock); - - /* "Show" method for files in '/<sysfs>/class/ubi/' */ --static ssize_t ubi_version_show(struct class *class, -- struct class_attribute *attr, char *buf) -+/* UBI version attribute ('/<sysfs>/class/ubi/version') */ -+static ssize_t version_show(struct class *class, struct class_attribute *attr, -+ char *buf) - { - return sprintf(buf, "%d\n", UBI_VERSION); - } -+static CLASS_ATTR_RO(version); - --/* UBI version attribute ('/<sysfs>/class/ubi/version') */ --static struct class_attribute ubi_class_attrs[] = { -- __ATTR(version, S_IRUGO, ubi_version_show, NULL), -- __ATTR_NULL -+static struct attributes *ubi_class_attrs[] = { -+ &class_attr_version.attr, -+ NULL, - }; -+ATTRIBUTE_GROUPS(ubi_class); - - /* Root UBI "class" object (corresponds to '/<sysfs>/class/ubi/') */ - struct class ubi_class = { - .name = UBI_NAME_STR, - .owner = THIS_MODULE, -- .class_attrs = ubi_class_attrs, -+ .class_groups = ubi_class_groups, - }; - - static ssize_t dev_attribute_show(struct device *dev, |