diff options
| author |   Tony Lindgren <tony@atomide.com> | 2019-08-13 03:40:10 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-08-13 03:40:10 -0700 |
| commit | 58e16d792a6a8c6b750f637a4649967fcac853dc (patch) | |
| tree | 778a940499ecfc6fb2d811dbfef735913d30618a /drivers/base/firmware_loader/fallback_table.c | |
| parent | ARM: OMAP1: ams-delta-fiq: Fix missing irq_ack (diff) | |
| parent | bus: ti-sysc: Simplify cleanup upon failures in sysc_probe() (diff) | |
| download | wireguard-linux-58e16d792a6a8c6b750f637a4649967fcac853dc.tar.xz wireguard-linux-58e16d792a6a8c6b750f637a4649967fcac853dc.zip | |
Merge branch 'ti-sysc-fixes' into fixes
Diffstat (limited to '')
| -rw-r--r-- | drivers/base/firmware_loader/fallback_table.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/base/firmware_loader/fallback_table.c b/drivers/base/firmware_loader/fallback_table.c index 776dd69cf5be..ba9d30b28edc 100644 --- a/drivers/base/firmware_loader/fallback_table.c +++ b/drivers/base/firmware_loader/fallback_table.c @@ -16,9 +16,6 @@ * firmware fallback configuration table */ -static unsigned int zero; -static unsigned int one = 1; - struct firmware_fallback_config fw_fallback_config = { .force_sysfs_fallback = IS_ENABLED(CONFIG_FW_LOADER_USER_HELPER_FALLBACK), .loading_timeout = 60, @@ -26,6 +23,7 @@ struct firmware_fallback_config fw_fallback_config = { }; EXPORT_SYMBOL_GPL(fw_fallback_config); +#ifdef CONFIG_SYSCTL struct ctl_table firmware_config_table[] = { { .procname = "force_sysfs_fallback", @@ -33,8 +31,8 @@ struct ctl_table firmware_config_table[] = { .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = proc_douintvec_minmax, - .extra1 = &zero, - .extra2 = &one, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, }, { .procname = "ignore_sysfs_fallback", @@ -42,9 +40,10 @@ struct ctl_table firmware_config_table[] = { .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = proc_douintvec_minmax, - .extra1 = &zero, - .extra2 = &one, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, }, { } }; EXPORT_SYMBOL_GPL(firmware_config_table); +#endif |