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

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

driver core: bus_type: add drv_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 drv_groups to struct bus_type which should be used
instead of drv_attrs.

drv_attrs will be removed from the structure soon.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fa6fdb33

drivers/base/base.h

+5 −0
Original line number Diff line number Diff line
@@ -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 driver_add_groups(struct device_driver *drv,

			     const struct attribute_group **groups);

extern void driver_remove_groups(struct device_driver *drv,

				 const struct attribute_group **groups);



extern int device_add_groups(struct device *dev,

			     const struct attribute_group **groups);

extern void device_remove_groups(struct device *dev,

drivers/base/bus.c

+5 −0
Original line number Diff line number Diff line
@@ -725,6 +725,10 @@ int bus_add_driver(struct device_driver *drv) 
		printk(KERN_ERR "%s: driver_add_attrs(%s) failed\n",

			__func__, drv->name);

	}

	error = driver_add_groups(drv, bus->drv_groups);

	if (error)

		printk(KERN_ERR "%s: driver_create_groups(%s) failed\n",

			__func__, drv->name);



	if (!drv->suppress_bind_attrs) {

		error = add_bind_files(drv);
@@ -762,6 +766,7 @@ void bus_remove_driver(struct device_driver *drv) 
	if (!drv->suppress_bind_attrs)

		remove_bind_files(drv);

	driver_remove_attrs(drv->bus, drv);

	driver_remove_groups(drv, drv->bus->drv_groups);

	driver_remove_file(drv, &driver_attr_uevent);

	klist_remove(&drv->p->knode_bus);

	pr_debug("bus: '%s': remove driver %s\n", drv->bus->name, drv->name);

drivers/base/driver.c

+4 −4
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ void driver_remove_file(struct device_driver *drv, 
}

EXPORT_SYMBOL_GPL(driver_remove_file);



static int driver_add_groups(struct device_driver *drv,

int driver_add_groups(struct device_driver *drv,

		      const struct attribute_group **groups)

{

	int error = 0;
@@ -143,7 +143,7 @@ static int driver_add_groups(struct device_driver *drv, 
	return error;

}



static void driver_remove_groups(struct device_driver *drv,

void driver_remove_groups(struct device_driver *drv,

			  const struct attribute_group **groups)

{

	int i;

include/linux/device.h

+3 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *); 
 * @dev_attrs:	Default attributes of the devices on the bus.

 * @drv_attrs:	Default attributes of the device drivers on the bus.

 * @dev_groups:	Default attributes of the devices on the bus.

 * @drv_groups: Default attributes of the device drivers on the bus.

 * @match:	Called, perhaps multiple times, whenever a new device or driver

 *		is added for this bus. It should return a nonzero value if the

 *		given device can be handled by the given driver.
@@ -106,8 +107,9 @@ struct bus_type { 
	struct device		*dev_root;

	struct bus_attribute	*bus_attrs;

	struct device_attribute	*dev_attrs;	/* use dev_groups instead */

	struct driver_attribute	*drv_attrs;

	struct driver_attribute	*drv_attrs;	/* use drv_groups instead */

	const struct attribute_group **dev_groups;

	const struct attribute_group **drv_groups;



	int (*match)(struct device *dev, struct device_driver *drv);

	int (*uevent)(struct device *dev, struct kobj_uevent_env *env);