summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-08 15:22:55 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-12 15:33:31 -0700
commitfa6fdb33b486a8afc5439c504da8d581e142c77d (patch)
tree2195533d76d3a35d78c9e685de128ca80248bea1 /drivers/base
parente70b0915124942204dec8064bb25756e8723b81a (diff)
downloadop-kernel-dev-fa6fdb33b486a8afc5439c504da8d581e142c77d.zip
op-kernel-dev-fa6fdb33b486a8afc5439c504da8d581e142c77d.tar.gz
driver core: bus_type: add dev_groups
attribute groups are much more flexible than just a list of attributes, due to their support for visibility of the attributes, and binary attributes. Add dev_groups to struct bus_type which should be used instead of dev_attrs. dev_attrs will be removed from the structure soon. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/base.h5
-rw-r--r--drivers/base/bus.c6
-rw-r--r--drivers/base/core.c7
3 files changed, 14 insertions, 4 deletions
diff --git a/drivers/base/base.h b/drivers/base/base.h
index b8bdfe6..fccf954 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -119,6 +119,11 @@ static inline int driver_match_device(struct device_driver *drv,
return drv->bus->match ? drv->bus->match(dev, drv) : 1;
}
+extern int device_add_groups(struct device *dev,
+ const struct attribute_group **groups);
+extern void device_remove_groups(struct device *dev,
+ const struct attribute_group **groups);
+
extern char *make_class_name(const char *name, struct kobject *kobj);
extern int devres_release_all(struct device *dev);
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index d414331..7b2dc5b 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -499,6 +499,9 @@ int bus_add_device(struct device *dev)
error = device_add_attrs(bus, dev);
if (error)
goto out_put;
+ error = device_add_groups(dev, bus->dev_groups);
+ if (error)
+ goto out_groups;
error = sysfs_create_link(&bus->p->devices_kset->kobj,
&dev->kobj, dev_name(dev));
if (error)
@@ -513,6 +516,8 @@ int bus_add_device(struct device *dev)
out_subsys:
sysfs_remove_link(&bus->p->devices_kset->kobj, dev_name(dev));
+out_groups:
+ device_remove_groups(dev, bus->dev_groups);
out_id:
device_remove_attrs(bus, dev);
out_put:
@@ -575,6 +580,7 @@ void bus_remove_device(struct device *dev)
sysfs_remove_link(&dev->bus->p->devices_kset->kobj,
dev_name(dev));
device_remove_attrs(dev->bus, dev);
+ device_remove_groups(dev, dev->bus->dev_groups);
if (klist_node_attached(&dev->p->knode_bus))
klist_del(&dev->p->knode_bus);
diff --git a/drivers/base/core.c b/drivers/base/core.c
index e51c787..09a99d6 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -491,8 +491,7 @@ static void device_remove_bin_attributes(struct device *dev,
device_remove_bin_file(dev, &attrs[i]);
}
-static int device_add_groups(struct device *dev,
- const struct attribute_group **groups)
+int device_add_groups(struct device *dev, const struct attribute_group **groups)
{
int error = 0;
int i;
@@ -511,8 +510,8 @@ static int device_add_groups(struct device *dev,
return error;
}
-static void device_remove_groups(struct device *dev,
- const struct attribute_group **groups)
+void device_remove_groups(struct device *dev,
+ const struct attribute_group **groups)
{
int i;
OpenPOWER on IntegriCloud