Merge tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core and debugfs updates from Greg KH: "Here is the "big" driver core and debugfs changes for 5.3-rc1 It's a lot of different patches, all across the tree due to some api changes and lots of debugfs cleanups. Other than the debugfs cleanups, in this set of changes we have: - bus iteration function cleanups - scripts/get_abi.pl tool to display and parse Documentation/ABI entries in a simple way - cleanups to Documenatation/ABI/ entries to make them parse easier due to typos and other minor things - default_attrs use for some ktype users - driver model documentation file conversions to .rst - compressed firmware file loading - deferred probe fixes All of these have been in linux-next for a while, with a bunch of merge issues that Stephen has been patient with me for" * tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (102 commits) debugfs: make error message a bit more verbose orangefs: fix build warning from debugfs cleanup patch ubifs: fix build warning after debugfs cleanup patch driver: core: Allow subsystems to continue deferring probe drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT arch_topology: Remove error messages on out-of-memory conditions lib: notifier-error-inject: no need to check return value of debugfs_create functions swiotlb: no need to check return value of debugfs_create functions ceph: no need to check return value of debugfs_create functions sunrpc: no need to check return value of debugfs_create functions ubifs: no need to check return value of debugfs_create functions orangefs: no need to check return value of debugfs_create functions nfsd: no need to check return value of debugfs_create functions lib: 842: no need to check return value of debugfs_create functions debugfs: provide pr_fmt() macro debugfs: log errors when something goes wrong drivers: s390/cio: Fix compilation warning about const qualifiers drivers: Add generic helper to match by of_node driver_find_device: Unify the match function with class_find_device() bus_find_device: Unify the match callback with class_find_device ...
This commit is contained in:
@@ -303,11 +303,12 @@ static ssize_t raid_bytes_show(struct kobject *kobj,
|
||||
return snprintf(buf, PAGE_SIZE, "%llu\n", val);
|
||||
}
|
||||
|
||||
static struct attribute *raid_attributes[] = {
|
||||
static struct attribute *raid_attrs[] = {
|
||||
BTRFS_ATTR_PTR(raid, total_bytes),
|
||||
BTRFS_ATTR_PTR(raid, used_bytes),
|
||||
NULL
|
||||
};
|
||||
ATTRIBUTE_GROUPS(raid);
|
||||
|
||||
static void release_raid_kobj(struct kobject *kobj)
|
||||
{
|
||||
@@ -317,7 +318,7 @@ static void release_raid_kobj(struct kobject *kobj)
|
||||
struct kobj_type btrfs_raid_ktype = {
|
||||
.sysfs_ops = &kobj_sysfs_ops,
|
||||
.release = release_raid_kobj,
|
||||
.default_attrs = raid_attributes,
|
||||
.default_groups = raid_groups,
|
||||
};
|
||||
|
||||
#define SPACE_INFO_ATTR(field) \
|
||||
@@ -364,6 +365,7 @@ static struct attribute *space_info_attrs[] = {
|
||||
BTRFS_ATTR_PTR(space_info, total_bytes_pinned),
|
||||
NULL,
|
||||
};
|
||||
ATTRIBUTE_GROUPS(space_info);
|
||||
|
||||
static void space_info_release(struct kobject *kobj)
|
||||
{
|
||||
@@ -375,7 +377,7 @@ static void space_info_release(struct kobject *kobj)
|
||||
struct kobj_type space_info_ktype = {
|
||||
.sysfs_ops = &kobj_sysfs_ops,
|
||||
.release = space_info_release,
|
||||
.default_attrs = space_info_attrs,
|
||||
.default_groups = space_info_groups,
|
||||
};
|
||||
|
||||
static const struct attribute *allocation_attrs[] = {
|
||||
@@ -910,12 +912,10 @@ void btrfs_sysfs_feature_update(struct btrfs_fs_info *fs_info,
|
||||
ret = sysfs_create_group(fsid_kobj, &btrfs_feature_attr_group);
|
||||
}
|
||||
|
||||
static int btrfs_init_debugfs(void)
|
||||
static void btrfs_init_debugfs(void)
|
||||
{
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
btrfs_debugfs_root_dentry = debugfs_create_dir("btrfs", NULL);
|
||||
if (!btrfs_debugfs_root_dentry)
|
||||
return -ENOMEM;
|
||||
|
||||
/*
|
||||
* Example code, how to export data through debugfs.
|
||||
@@ -929,7 +929,6 @@ static int btrfs_init_debugfs(void)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __init btrfs_init_sysfs(void)
|
||||
@@ -940,9 +939,7 @@ int __init btrfs_init_sysfs(void)
|
||||
if (!btrfs_kset)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = btrfs_init_debugfs();
|
||||
if (ret)
|
||||
goto out1;
|
||||
btrfs_init_debugfs();
|
||||
|
||||
init_feature_attrs();
|
||||
ret = sysfs_create_group(&btrfs_kset->kobj, &btrfs_feature_attr_group);
|
||||
@@ -959,7 +956,6 @@ out_remove_group:
|
||||
sysfs_remove_group(&btrfs_kset->kobj, &btrfs_feature_attr_group);
|
||||
out2:
|
||||
debugfs_remove_recursive(btrfs_debugfs_root_dentry);
|
||||
out1:
|
||||
kset_unregister(btrfs_kset);
|
||||
|
||||
return ret;
|
||||
|
Reference in New Issue
Block a user