leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Driver core: add groups support to struct device

Browse Source 
This is needed for the network class devices in order to be able to
convert over to use struct device.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2006-06-27 00:06:09 -07:00
parent 386415d88b
commit de0ff00d72
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/base/core.c
View File

@ -197,6 +197,35 @@ static ssize_t store_uevent(struct device *dev, struct device_attribute *attr,
return count;
}
static int device_add_groups(struct device *dev)
{
int i;
int error = 0;
if (dev->groups) {
for (i = 0; dev->groups[i]; i++) {
error = sysfs_create_group(&dev->kobj, dev->groups[i]);
if (error) {
while (--i >= 0)
sysfs_remove_group(&dev->kobj, dev->groups[i]);
goto out;
}
}
}
out:
return error;
}
static void device_remove_groups(struct device *dev)
{
int i;
if (dev->groups) {
for (i = 0; dev->groups[i]; i++) {
sysfs_remove_group(&dev->kobj, dev->groups[i]);
}
}
}
static ssize_t show_dev(struct device *dev, struct device_attribute *attr,
char *buf)
{
@ -350,6 +379,8 @@ int device_add(struct device *dev)
sysfs_create_link(&dev->parent->kobj, &dev->kobj, class_name);
}
if ((error = device_add_groups(dev)))
goto GroupError;
if ((error = device_pm_add(dev)))
goto PMError;
if ((error = bus_add_device(dev)))
@ -376,6 +407,8 @@ int device_add(struct device *dev)
BusError:
device_pm_remove(dev);
PMError:
device_remove_groups(dev);
GroupError:
if (dev->devt_attr) {
device_remove_file(dev, dev->devt_attr);
kfree(dev->devt_attr);
@ -470,6 +503,7 @@ void device_del(struct device * dev)
up(&dev->class->sem);
}
device_remove_file(dev, &dev->uevent_attr);
device_remove_groups(dev);
/* Notify the platform of the removal, in case they
* need to do anything...

1
include/linux/device.h
View File

@ -344,6 +344,7 @@ struct device {
struct list_head node;
struct class *class; /* optional*/
dev_t devt; /* dev_t, creates the sysfs "dev" */
struct attribute_group **groups; /* optional groups */
void (*release)(struct device * dev);
};