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

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

mips: convert vpe_class to use dev_groups 



The dev_attrs field of struct class is going away soon, dev_groups
should be used instead.  This converts the MIPS vpe_class code to use
the correct field.

Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: John Crispin <blogic@openwrt.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cebcac7c

arch/mips/kernel/vpe.c

+10 −7
Original line number Diff line number Diff line
@@ -1335,8 +1335,9 @@ static ssize_t store_kill(struct device *dev, struct device_attribute *attr, 


	return len;

}

static DEVICE_ATTR(kill, S_IWUSR, NULL, store_kill);



static ssize_t show_ntcs(struct device *cd, struct device_attribute *attr,

static ssize_t ntcs_show(struct device *cd, struct device_attribute *attr,

			 char *buf)

{

	struct vpe *vpe = get_vpe(tclimit);
@@ -1344,7 +1345,7 @@ static ssize_t show_ntcs(struct device *cd, struct device_attribute *attr, 
	return sprintf(buf, "%d\n", vpe->ntcs);

}



static ssize_t store_ntcs(struct device *dev, struct device_attribute *attr,

static ssize_t ntcs_store(struct device *dev, struct device_attribute *attr,

			  const char *buf, size_t len)

{

	struct vpe *vpe = get_vpe(tclimit);
@@ -1365,12 +1366,14 @@ static ssize_t store_ntcs(struct device *dev, struct device_attribute *attr, 
out_einval:

	return -EINVAL;

}

static DEVICE_ATTR_RW(ntcs);



static struct device_attribute vpe_class_attributes[] = {

	__ATTR(kill, S_IWUSR, NULL, store_kill),

	__ATTR(ntcs, S_IRUGO | S_IWUSR, show_ntcs, store_ntcs),

	{}

static struct attribute vpe_attrs[] = {

	&dev_attr_kill.attr,

	&dev_attr_ntcs.attr,

	NULL,

};

ATTRIBUTE_GROUPS(vpe);



static void vpe_device_release(struct device *cd)

{
@@ -1381,7 +1384,7 @@ struct class vpe_class = { 
	.name = "vpe",

	.owner = THIS_MODULE,

	.dev_release = vpe_device_release,

	.dev_attrs = vpe_class_attributes,

	.dev_groups = vpe_groups,

};



struct device vpe_device;