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

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

workqueue: convert bus code to use dev_groups 



The dev_attrs field of struct bus_type is going away soon, dev_groups
should be used instead.  This converts the workqueue bus code to use
the correct field.

Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 32f389ec

kernel/workqueue.c

+15 −12
Original line number Diff line number Diff line
@@ -3081,15 +3081,16 @@ static struct workqueue_struct *dev_to_wq(struct device *dev) 
	return wq_dev->wq;

}



static ssize_t wq_per_cpu_show(struct device *dev,

			       struct device_attribute *attr, char *buf)

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

			    char *buf)

{

	struct workqueue_struct *wq = dev_to_wq(dev);



	return scnprintf(buf, PAGE_SIZE, "%d\n", (bool)!(wq->flags & WQ_UNBOUND));

}

static DEVICE_ATTR_RO(per_cpu);



static ssize_t wq_max_active_show(struct device *dev,

static ssize_t max_active_show(struct device *dev,

			       struct device_attribute *attr, char *buf)

{

	struct workqueue_struct *wq = dev_to_wq(dev);
@@ -3097,9 +3098,9 @@ static ssize_t wq_max_active_show(struct device *dev, 
	return scnprintf(buf, PAGE_SIZE, "%d\n", wq->saved_max_active);

}



static ssize_t wq_max_active_store(struct device *dev,

				   struct device_attribute *attr,

				   const char *buf, size_t count)

static ssize_t max_active_store(struct device *dev,

				struct device_attribute *attr, const char *buf,

				size_t count)

{

	struct workqueue_struct *wq = dev_to_wq(dev);

	int val;
@@ -3110,12 +3111,14 @@ static ssize_t wq_max_active_store(struct device *dev, 
	workqueue_set_max_active(wq, val);

	return count;

}

static DEVICE_ATTR_RW(max_active);



static struct device_attribute wq_sysfs_attrs[] = {

	__ATTR(per_cpu, 0444, wq_per_cpu_show, NULL),

	__ATTR(max_active, 0644, wq_max_active_show, wq_max_active_store),

	__ATTR_NULL,

static struct attribute *wq_sysfs_attrs[] = {

	&dev_attr_per_cpu.attr,

	&dev_attr_max_active.attr,

	NULL,

};

ATTRIBUTE_GROUPS(wq_sysfs);



static ssize_t wq_pool_ids_show(struct device *dev,

				struct device_attribute *attr, char *buf)
@@ -3265,7 +3268,7 @@ static struct device_attribute wq_sysfs_unbound_attrs[] = { 


static struct bus_type wq_subsys = {

	.name				= "workqueue",

	.dev_attrs			= wq_sysfs_attrs,

	.dev_groups			= wq_sysfs_groups,

};



static int __init wq_sysfs_init(void)