aboutsummaryrefslogtreecommitdiffstats
path: root/c09.patch
diff options
Diffstat (limited to 'c09.patch')
-rw-r--r--c09.patch96
1 files changed, 0 insertions, 96 deletions
diff --git a/c09.patch b/c09.patch
deleted file mode 100644
index fddbb2df18e919..00000000000000
--- a/c09.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From foo@baz Tue Jun 6 14:48:27 CEST 2017
-Date: Tue, 06 Jun 2017 14:48:27 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: pktcdvd: 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: <linux-block@vger.kernel.org>
-Cc: Jens Axboe <axboe@fb.com>
-Cc: Hannes Reinecke <hare@suse.com>
-Cc: Jan Kara <jack@suse.cz>
-Cc: Mike Christie <mchristi@redhat.com>
-Cc: Bart Van Assche <Bart.VanAssche@sandisk.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/block/pktcdvd.c | 35 +++++++++++++++++------------------
- 1 file changed, 17 insertions(+), 18 deletions(-)
-
---- a/drivers/block/pktcdvd.c
-+++ b/drivers/block/pktcdvd.c
-@@ -348,9 +348,9 @@ static void class_pktcdvd_release(struct
- {
- kfree(cls);
- }
--static ssize_t class_pktcdvd_show_map(struct class *c,
-- struct class_attribute *attr,
-- char *data)
-+
-+static ssize_t device_map_show(struct class *c, struct class_attribute *attr,
-+ char *data)
- {
- int n = 0;
- int idx;
-@@ -368,11 +368,10 @@ static ssize_t class_pktcdvd_show_map(st
- mutex_unlock(&ctl_mutex);
- return n;
- }
-+static CLASS_ATTR_RO(device_map);
-
--static ssize_t class_pktcdvd_store_add(struct class *c,
-- struct class_attribute *attr,
-- const char *buf,
-- size_t count)
-+static ssize_t add_store(struct class *c, struct class_attribute *attr,
-+ const char *buf, size_t count)
- {
- unsigned int major, minor;
-
-@@ -390,11 +389,10 @@ static ssize_t class_pktcdvd_store_add(s
-
- return -EINVAL;
- }
-+static CLASS_ATTR_WO(add);
-
--static ssize_t class_pktcdvd_store_remove(struct class *c,
-- struct class_attribute *attr,
-- const char *buf,
-- size_t count)
-+static ssize_t remove_store(struct class *c, struct class_attribute *attr,
-+ const char *buf, size_t count)
- {
- unsigned int major, minor;
- if (sscanf(buf, "%u:%u", &major, &minor) == 2) {
-@@ -403,14 +401,15 @@ static ssize_t class_pktcdvd_store_remov
- }
- return -EINVAL;
- }
-+static CLASS_ATTR_WO(remove);
-
--static struct class_attribute class_pktcdvd_attrs[] = {
-- __ATTR(add, 0200, NULL, class_pktcdvd_store_add),
-- __ATTR(remove, 0200, NULL, class_pktcdvd_store_remove),
-- __ATTR(device_map, 0444, class_pktcdvd_show_map, NULL),
-- __ATTR_NULL
-+static struct attribute *class_pktcdvd_attrs[] = {
-+ &class_attr_add.attr,
-+ &class_attr_remove.attr,
-+ &class_attr_device_map.attr,
-+ NULL,
- };
--
-+ATTRIBUTE_GROUPS(class_pktcdvd);
-
- static int pkt_sysfs_init(void)
- {
-@@ -426,7 +425,7 @@ static int pkt_sysfs_init(void)
- class_pktcdvd->name = DRIVER_NAME;
- class_pktcdvd->owner = THIS_MODULE;
- class_pktcdvd->class_release = class_pktcdvd_release;
-- class_pktcdvd->class_attrs = class_pktcdvd_attrs;
-+ class_pktcdvd->class_groups = class_pktcdvd_groups;
- ret = class_register(class_pktcdvd);
- if (ret) {
- kfree(class_pktcdvd);