Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc307f92 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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>
Acked-by: default avatarJens 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d83bb159

drivers/block/pktcdvd.c

+17 −18
Original line number Diff line number Diff line
@@ -348,8 +348,8 @@ static void class_pktcdvd_release(struct class *cls) 
{

	kfree(cls);

}

static ssize_t class_pktcdvd_show_map(struct class *c,

					struct class_attribute *attr,



static ssize_t device_map_show(struct class *c, struct class_attribute *attr,

			       char *data)

{

	int n = 0;
@@ -368,11 +368,10 @@ static ssize_t class_pktcdvd_show_map(struct class *c, 
	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(struct class *c, 


	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_remove(struct class *c, 
	}

	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);