aboutsummaryrefslogtreecommitdiff
path: root/drivers/base/firmware_loader/sysfs.c
diff options
context:
space:
mode:
authorGravatar Russ Weight <russell.h.weight@intel.com> 2022-04-26 13:03:55 -0700
committerGravatar Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2022-04-29 16:49:44 +0200
commitbc187f6f8d12568413656e2e5b0d51a001e21915 (patch)
tree4221a16533722959fbe90c1198eeebf7821b7617 /drivers/base/firmware_loader/sysfs.c
parentselftests: firmware: Add firmware upload selftests (diff)
downloadlinux-bc187f6f8d12568413656e2e5b0d51a001e21915.tar.gz
linux-bc187f6f8d12568413656e2e5b0d51a001e21915.tar.bz2
linux-bc187f6f8d12568413656e2e5b0d51a001e21915.zip
firmware_loader: Fix configs for sysfs split
Fix the CONFIGs around register_sysfs_loader(), unregister_sysfs_loader(), register_firmware_config_sysctl(), and unregister_firmware_config_sysctl(). The full definitions of the register_sysfs_loader() and unregister_sysfs_loader() functions should be used whenever CONFIG_FW_LOADER_SYSFS is defined. The register_firmware_config_sysctl() and unregister_firmware_config_sysctl() functions should be stubbed out unless CONFIG_FW_LOADER_USER_HELPER CONFIG_SYSCTL are both defined. Signed-off-by: Russ Weight <russell.h.weight@intel.com> Link: https://lore.kernel.org/r/20220426200356.126085-2-russell.h.weight@intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/firmware_loader/sysfs.c')
-rw-r--r--drivers/base/firmware_loader/sysfs.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/base/firmware_loader/sysfs.c b/drivers/base/firmware_loader/sysfs.c
index c09fcebeada9..eb7d9322a56e 100644
--- a/drivers/base/firmware_loader/sysfs.c
+++ b/drivers/base/firmware_loader/sysfs.c
@@ -110,7 +110,6 @@ static struct class firmware_class = {
.dev_release = fw_dev_release,
};
-#ifdef CONFIG_FW_LOADER_USER_HELPER
int register_sysfs_loader(void)
{
int ret = class_register(&firmware_class);
@@ -125,7 +124,6 @@ void unregister_sysfs_loader(void)
unregister_firmware_config_sysctl();
class_unregister(&firmware_class);
}
-#endif
static ssize_t firmware_loading_show(struct device *dev,
struct device_attribute *attr, char *buf)