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

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

driver core: bus_type: add bus_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 bus_groups to struct bus_type which should be used
instead of bus_attrs.

bus_attrs will be removed from the structure soon.

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

drivers/base/bus.c

+37 −0
Original line number Original line Diff line number Diff line
@@ -881,6 +881,37 @@ static void bus_remove_attrs(struct bus_type *bus) 
	}

	}

}

}





static int bus_add_groups(struct bus_type *bus,

			  const struct attribute_group **groups)

{

	int error = 0;

	int i;



	if (groups) {

		for (i = 0; groups[i]; i++) {

			error = sysfs_create_group(&bus->p->subsys.kobj,

						   groups[i]);

			if (error) {

				while (--i >= 0)

					sysfs_remove_group(&bus->p->subsys.kobj,

							   groups[i]);

				break;

			}

		}

	}

	return error;

}



static void bus_remove_groups(struct bus_type *bus,

			      const struct attribute_group **groups)

{

	int i;



	if (groups)

		for (i = 0; groups[i]; i++)

			sysfs_remove_group(&bus->p->subsys.kobj, groups[i]);

}



static void klist_devices_get(struct klist_node *n)

static void klist_devices_get(struct klist_node *n)

{

{

	struct device_private *dev_prv = to_device_private_bus(n);

	struct device_private *dev_prv = to_device_private_bus(n);
@@ -973,10 +1004,15 @@ int bus_register(struct bus_type *bus) 
	retval = bus_add_attrs(bus);

	retval = bus_add_attrs(bus);

	if (retval)

	if (retval)

		goto bus_attrs_fail;

		goto bus_attrs_fail;

	retval = bus_add_groups(bus, bus->bus_groups);

	if (retval)

		goto bus_groups_fail;





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

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

	return 0;

	return 0;





bus_groups_fail:

	bus_remove_attrs(bus);

bus_attrs_fail:

bus_attrs_fail:

	remove_probe_files(bus);

	remove_probe_files(bus);

bus_probe_files_fail:

bus_probe_files_fail:
@@ -1007,6 +1043,7 @@ void bus_unregister(struct bus_type *bus) 
	if (bus->dev_root)

	if (bus->dev_root)

		device_unregister(bus->dev_root);

		device_unregister(bus->dev_root);

	bus_remove_attrs(bus);

	bus_remove_attrs(bus);

	bus_remove_groups(bus, bus->bus_groups);

	remove_probe_files(bus);

	remove_probe_files(bus);

	kset_unregister(bus->p->drivers_kset);

	kset_unregister(bus->p->drivers_kset);

	kset_unregister(bus->p->devices_kset);

	kset_unregister(bus->p->devices_kset);

include/linux/device.h

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

 * @bus_attrs:	Default attributes of the bus.

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

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

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

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

 * @bus_groups:	Default attributes of the bus.

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

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

 * @drv_groups: Default attributes of the device drivers 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

 * @match:	Called, perhaps multiple times, whenever a new device or driver
@@ -105,9 +106,10 @@ struct bus_type { 
	const char		*name;

	const char		*name;

	const char		*dev_name;

	const char		*dev_name;

	struct device		*dev_root;

	struct device		*dev_root;

	struct bus_attribute	*bus_attrs;

	struct bus_attribute	*bus_attrs;	/* use bus_groups instead */

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

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

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

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

	const struct attribute_group **bus_groups;

	const struct attribute_group **dev_groups;

	const struct attribute_group **dev_groups;

	const struct attribute_group **drv_groups;

	const struct attribute_group **drv_groups;