| Message ID | 1471969646-13119-1-git-send-email-yamada.masahiro@socionext.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 749bc03ae2cd763df19ab8000d21b4342ed3383c |
| Delegated to: | Kalle Valo |
| Headers | show |
Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > Commit 97f2645f358b ("tree-wide: replace config_enabled() with > IS_ENABLED()") mostly did away with config_enabled(). > > This is one of the postponed TODO items as config_enabled() is used > for a tristate option here. Theoretically, config_enabled() is > equivalent to IS_BUILTIN(), but I guess IS_REACHABLE() is the best > fit for this case because both CONFIG_HWMON and CONFIG_ATH10K are > tristate. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Thanks, 1 patch applied to ath-next branch of ath.git: 749bc03ae2cd ath10k: replace config_enabled() with IS_REACHABLE()
diff --git a/drivers/net/wireless/ath/ath10k/thermal.c b/drivers/net/wireless/ath/ath10k/thermal.c index 444b52c..0a47269 100644 --- a/drivers/net/wireless/ath/ath10k/thermal.c +++ b/drivers/net/wireless/ath/ath10k/thermal.c @@ -192,7 +192,7 @@ int ath10k_thermal_register(struct ath10k *ar) /* Avoid linking error on devm_hwmon_device_register_with_groups, I * guess linux/hwmon.h is missing proper stubs. */ - if (!config_enabled(CONFIG_HWMON)) + if (!IS_REACHABLE(CONFIG_HWMON)) return 0; hwmon_dev = devm_hwmon_device_register_with_groups(ar->dev,
Commit 97f2645f358b ("tree-wide: replace config_enabled() with IS_ENABLED()") mostly did away with config_enabled(). This is one of the postponed TODO items as config_enabled() is used for a tristate option here. Theoretically, config_enabled() is equivalent to IS_BUILTIN(), but I guess IS_REACHABLE() is the best fit for this case because both CONFIG_HWMON and CONFIG_ATH10K are tristate. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/net/wireless/ath/ath10k/thermal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)