Merge tag 'ib-mfd-many-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...

[sfrench/cifs-2.6.git] / drivers / base / core.c

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 755451f684bcac6c2e94e3dcccfa279ce90cb80a..cb4b5b1f1b095e951187289ab565fe632a4013c6 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1023,12 +1023,144 @@ int device_add_groups(struct device *dev, const struct attribute_group **groups)
 {
        return sysfs_create_groups(&dev->kobj, groups);
 }
+EXPORT_SYMBOL_GPL(device_add_groups);
 
 void device_remove_groups(struct device *dev,
                          const struct attribute_group **groups)
 {
        sysfs_remove_groups(&dev->kobj, groups);
 }
+EXPORT_SYMBOL_GPL(device_remove_groups);
+
+union device_attr_group_devres {
+       const struct attribute_group *group;
+       const struct attribute_group **groups;
+};
+
+static int devm_attr_group_match(struct device *dev, void *res, void *data)
+{
+       return ((union device_attr_group_devres *)res)->group == data;
+}
+
+static void devm_attr_group_remove(struct device *dev, void *res)
+{
+       union device_attr_group_devres *devres = res;
+       const struct attribute_group *group = devres->group;
+
+       dev_dbg(dev, "%s: removing group %p\n", __func__, group);
+       sysfs_remove_group(&dev->kobj, group);
+}
+
+static void devm_attr_groups_remove(struct device *dev, void *res)
+{
+       union device_attr_group_devres *devres = res;
+       const struct attribute_group **groups = devres->groups;
+
+       dev_dbg(dev, "%s: removing groups %p\n", __func__, groups);
+       sysfs_remove_groups(&dev->kobj, groups);
+}
+
+/**
+ * devm_device_add_group - given a device, create a managed attribute group
+ * @dev:       The device to create the group for
+ * @grp:       The attribute group to create
+ *
+ * This function creates a group for the first time.  It will explicitly
+ * warn and error if any of the attribute files being created already exist.
+ *
+ * Returns 0 on success or error code on failure.
+ */
+int devm_device_add_group(struct device *dev, const struct attribute_group *grp)
+{
+       union device_attr_group_devres *devres;
+       int error;
+
+       devres = devres_alloc(devm_attr_group_remove,
+                             sizeof(*devres), GFP_KERNEL);
+       if (!devres)
+               return -ENOMEM;
+
+       error = sysfs_create_group(&dev->kobj, grp);
+       if (error) {
+               devres_free(devres);
+               return error;
+       }
+
+       devres->group = grp;
+       devres_add(dev, devres);
+       return 0;
+}
+EXPORT_SYMBOL_GPL(devm_device_add_group);
+
+/**
+ * devm_device_remove_group: remove a managed group from a device
+ * @dev:       device to remove the group from
+ * @grp:       group to remove
+ *
+ * This function removes a group of attributes from a device. The attributes
+ * previously have to have been created for this group, otherwise it will fail.
+ */
+void devm_device_remove_group(struct device *dev,
+                             const struct attribute_group *grp)
+{
+       WARN_ON(devres_release(dev, devm_attr_group_remove,
+                              devm_attr_group_match,
+                              /* cast away const */ (void *)grp));
+}
+EXPORT_SYMBOL_GPL(devm_device_remove_group);
+
+/**
+ * devm_device_add_groups - create a bunch of managed attribute groups
+ * @dev:       The device to create the group for
+ * @groups:    The attribute groups to create, NULL terminated
+ *
+ * This function creates a bunch of managed attribute groups.  If an error
+ * occurs when creating a group, all previously created groups will be
+ * removed, unwinding everything back to the original state when this
+ * function was called.  It will explicitly warn and error if any of the
+ * attribute files being created already exist.
+ *
+ * Returns 0 on success or error code from sysfs_create_group on failure.
+ */
+int devm_device_add_groups(struct device *dev,
+                          const struct attribute_group **groups)
+{
+       union device_attr_group_devres *devres;
+       int error;
+
+       devres = devres_alloc(devm_attr_groups_remove,
+                             sizeof(*devres), GFP_KERNEL);
+       if (!devres)
+               return -ENOMEM;
+
+       error = sysfs_create_groups(&dev->kobj, groups);
+       if (error) {
+               devres_free(devres);
+               return error;
+       }
+
+       devres->groups = groups;
+       devres_add(dev, devres);
+       return 0;
+}
+EXPORT_SYMBOL_GPL(devm_device_add_groups);
+
+/**
+ * devm_device_remove_groups - remove a list of managed groups
+ *
+ * @dev:       The device for the groups to be removed from
+ * @groups:    NULL terminated list of groups to be removed
+ *
+ * If groups is not NULL, remove the specified groups from the device.
+ */
+void devm_device_remove_groups(struct device *dev,
+                              const struct attribute_group **groups)
+{
+       WARN_ON(devres_release(dev, devm_attr_groups_remove,
+                              devm_attr_group_match,
+                              /* cast away const */ (void *)groups));
+}
+EXPORT_SYMBOL_GPL(devm_device_remove_groups);
 
 static int device_add_attrs(struct device *dev)
 {