lkml.org 
[lkml]   [2023]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [PATCH 3/3] driver core: remove devm_device_add_groups()
    On Tue, Jul 4, 2023 at 3:17 PM Greg Kroah-Hartman
    <gregkh@linuxfoundation.org> wrote:
    >
    > There is no more in-kernel users of this function, and no driver should
    > ever be using it, so remove it from the kernel.
    >
    > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    > Cc: "Rafael J. Wysocki" <rafael@kernel.org>
    > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    Acked-by: Rafael J. Wysocki <rafael@kernel.org>

    > ---
    > drivers/base/core.c | 45 ------------------------------------------
    > include/linux/device.h | 2 --
    > 2 files changed, 47 deletions(-)
    >
    > diff --git a/drivers/base/core.c b/drivers/base/core.c
    > index 3dff5037943e..94187c0b577d 100644
    > --- a/drivers/base/core.c
    > +++ b/drivers/base/core.c
    > @@ -2748,15 +2748,6 @@ static void devm_attr_group_remove(struct device *dev, void *res)
    > 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
    > @@ -2789,42 +2780,6 @@ int devm_device_add_group(struct device *dev, const struct attribute_group *grp)
    > }
    > EXPORT_SYMBOL_GPL(devm_device_add_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);
    > -
    > static int device_add_attrs(struct device *dev)
    > {
    > const struct class *class = dev->class;
    > diff --git a/include/linux/device.h b/include/linux/device.h
    > index 66c13965153d..6dd087e4223d 100644
    > --- a/include/linux/device.h
    > +++ b/include/linux/device.h
    > @@ -1164,8 +1164,6 @@ static inline void device_remove_group(struct device *dev,
    > return device_remove_groups(dev, groups);
    > }
    >
    > -int __must_check devm_device_add_groups(struct device *dev,
    > - const struct attribute_group **groups);
    > int __must_check devm_device_add_group(struct device *dev,
    > const struct attribute_group *grp);
    >
    > --
    > 2.41.0
    >

    \
     
     \ /
      Last update: 2023-07-04 18:08    [W:2.329 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site