diff options
| author | Paul Cercueil <paul@crapouillou.net> | 2022-04-18 20:44:36 +0100 |
|---|---|---|
| committer | Paul Cercueil <paul@crapouillou.net> | 2022-04-18 20:46:55 +0100 |
| commit | 40f458b7816bd3ddddc068998523b4e039c04818 (patch) | |
| tree | f88d18bd293fb646a53cc025fa72329b0f738e97 /lib/kobject.c | |
| parent | c6ed9f66eb70aeaac9998bd3552ada740d90e20c (diff) | |
| parent | c54b39a565227538c52ead2349eb17d54aadd6f7 (diff) | |
Merge drm/drm-next into drm-misc-next
drm/drm-next has a build fix for the NewVision NV3052C panel
(drivers/gpu/drm/panel/panel-newvision-nv3052c.c), which needs to be
merged back to drm-misc-next, as it was failing to build there.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Diffstat (limited to 'lib/kobject.c')
| -rw-r--r-- | lib/kobject.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index 56fa037501b56..5f0e71ab292cb 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -54,32 +54,6 @@ void kobject_get_ownership(struct kobject *kobj, kuid_t *uid, kgid_t *gid) kobj->ktype->get_ownership(kobj, uid, gid); } -/* - * populate_dir - populate directory with attributes. - * @kobj: object we're working on. - * - * Most subsystems have a set of default attributes that are associated - * with an object that registers with them. This is a helper called during - * object registration that loops through the default attributes of the - * subsystem and creates attributes files for them in sysfs. - */ -static int populate_dir(struct kobject *kobj) -{ - const struct kobj_type *t = get_ktype(kobj); - struct attribute *attr; - int error = 0; - int i; - - if (t && t->default_attrs) { - for (i = 0; (attr = t->default_attrs[i]) != NULL; i++) { - error = sysfs_create_file(kobj, attr); - if (error) - break; - } - } - return error; -} - static int create_dir(struct kobject *kobj) { const struct kobj_type *ktype = get_ktype(kobj); @@ -90,12 +64,6 @@ static int create_dir(struct kobject *kobj) if (error) return error; - error = populate_dir(kobj); - if (error) { - sysfs_remove_dir(kobj); - return error; - } - if (ktype) { error = sysfs_create_groups(kobj, ktype->default_groups); if (error) { |