hwmon: (core) Avoid ifdef CONFIG_THERMAL in C source file

Using an #ifdef in a C source files to have different definitions
of the same symbol makes the code harder to read and understand.
Furthermore it makes it harder to test compilation of the different
branches.

Replace the ifdeffery with IS_ENABLED() which is just a normal
conditional.
The resulting binary is still the same as before as the compiler
optimizes away all the unused code and definitions.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index bbb9cc44e29fbc635706db5bed21f3b8a1cd4987..9ed750d4c4f51179a56289db4039bcc1fc5f5c64 100644 (file)
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -158,11 +158,6 @@ static umode_t hwmon_is_visible(const struct hwmon_ops *ops,
 
 /* Thermal zone handling */
 
-/*
- * The complex conditional is necessary to avoid a cyclic dependency
- * between hwmon and thermal_sys modules.
- */
-#ifdef CONFIG_THERMAL_OF
 static int hwmon_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
 {
        struct hwmon_thermal_data *tdata = thermal_zone_device_priv(tz);
@@ -268,6 +263,9 @@ static int hwmon_thermal_register_sensors(struct device *dev)
        void *drvdata = dev_get_drvdata(dev);
        int i;
 
+       if (!IS_ENABLED(CONFIG_THERMAL_OF))
+               return 0;
+
        for (i = 1; info[i]; i++) {
                int j;
 
@@ -296,6 +294,9 @@ static void hwmon_thermal_notify(struct device *dev, int index)
        struct hwmon_device *hwdev = to_hwmon_device(dev);
        struct hwmon_thermal_data *tzdata;
 
+       if (!IS_ENABLED(CONFIG_THERMAL_OF))
+               return;
+
        list_for_each_entry(tzdata, &hwdev->tzdata, node) {
                if (tzdata->index == index) {
                        thermal_zone_device_update(tzdata->tzd,
@@ -304,16 +305,6 @@ static void hwmon_thermal_notify(struct device *dev, int index)
        }
 }
 
-#else
-static int hwmon_thermal_register_sensors(struct device *dev)
-{
-       return 0;
-}
-
-static void hwmon_thermal_notify(struct device *dev, int index) { }
-
-#endif /* IS_REACHABLE(CONFIG_THERMAL) && ... */
-
 static int hwmon_attr_base(enum hwmon_sensor_types type)
 {
        if (type == hwmon_in || type == hwmon_intrusion)