Skip to content

Commit

Permalink
driver core: Introduce default attribute groups.
Browse files Browse the repository at this point in the history
This is lot like default attributes for devices (and indeed,
a lot of the code is lifted from there).

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Cornelia Huck authored and Greg Kroah-Hartman committed Jan 25, 2008
1 parent 2b93730 commit 57c7453
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 1 deletion.
42 changes: 41 additions & 1 deletion drivers/base/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,37 @@ void put_driver(struct device_driver * drv)
kobject_put(&drv->kobj);
}

static int driver_add_groups(struct device_driver *drv,
struct attribute_group **groups)
{
int error = 0;
int i;

if (groups) {
for (i = 0; groups[i]; i++) {
error = sysfs_create_group(&drv->kobj, groups[i]);
if (error) {
while (--i >= 0)
sysfs_remove_group(&drv->kobj,
groups[i]);
break;
}
}
}
return error;
}

static void driver_remove_groups(struct device_driver *drv,
struct attribute_group **groups)
{
int i;

if (groups)
for (i = 0; groups[i]; i++)
sysfs_remove_group(&drv->kobj, groups[i]);
}


/**
* driver_register - register driver with bus
* @drv: driver to register
Expand All @@ -152,13 +183,21 @@ void put_driver(struct device_driver * drv)
*/
int driver_register(struct device_driver * drv)
{
int ret;

if ((drv->bus->probe && drv->probe) ||
(drv->bus->remove && drv->remove) ||
(drv->bus->shutdown && drv->shutdown)) {
printk(KERN_WARNING "Driver '%s' needs updating - please use bus_type methods\n", drv->name);
}
klist_init(&drv->klist_devices, NULL, NULL);
return bus_add_driver(drv);
ret = bus_add_driver(drv);
if (ret)
return ret;
ret = driver_add_groups(drv, drv->groups);
if (ret)
bus_remove_driver(drv);
return ret;
}

/**
Expand All @@ -170,6 +209,7 @@ int driver_register(struct device_driver * drv)

void driver_unregister(struct device_driver * drv)
{
driver_remove_groups(drv, drv->groups);
bus_remove_driver(drv);
}

Expand Down
1 change: 1 addition & 0 deletions include/linux/device.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ struct device_driver {
void (*shutdown) (struct device * dev);
int (*suspend) (struct device * dev, pm_message_t state);
int (*resume) (struct device * dev);
struct attribute_group **groups;
};


Expand Down

0 comments on commit 57c7453

Please sign in to comment.