| Message ID | 20190617123746.769592-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 3253854dc19f1610b8d01fb9265bbd98ce18abd7 |
| Headers | show |
| Series | hwmon: (max6650) Fix unused variable warning | expand |
On Mon, Jun 17, 2019 at 02:34:30PM +0200, Arnd Bergmann wrote: > The newly added variable is only used in an #if block: > > drivers/hwmon/max6650.c: In function 'max6650_probe': > drivers/hwmon/max6650.c:766:33: error: unused variable 'cooling_dev' [-Werror=unused-variable] > > Change the #if to if() so the compiler can see what is actually > going on. > > Fixes: a8463754a5a9 ("hwmon: (max6650) Use devm function to register thermal device") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Applied. Thanks, Guenter > --- > drivers/hwmon/max6650.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c > index 5fdad4645cca..3d9d371c35b5 100644 > --- a/drivers/hwmon/max6650.c > +++ b/drivers/hwmon/max6650.c > @@ -467,8 +467,6 @@ static int max6650_init_client(struct max6650_data *data, > return 0; > } > > -#if IS_ENABLED(CONFIG_THERMAL) > - > static int max6650_get_max_state(struct thermal_cooling_device *cdev, > unsigned long *state) > { > @@ -517,7 +515,6 @@ static const struct thermal_cooling_device_ops max6650_cooling_ops = { > .get_cur_state = max6650_get_cur_state, > .set_cur_state = max6650_set_cur_state, > }; > -#endif > > static int max6650_read(struct device *dev, enum hwmon_sensor_types type, > u32 attr, int channel, long *val) > @@ -795,14 +792,16 @@ static int max6650_probe(struct i2c_client *client, > if (err) > return err; > > -#if IS_ENABLED(CONFIG_THERMAL) > - cooling_dev = devm_thermal_of_cooling_device_register(dev, dev->of_node, > - client->name, data, &max6650_cooling_ops); > - if (IS_ERR(cooling_dev)) { > - dev_warn(dev, "thermal cooling device register failed: %ld\n", > - PTR_ERR(cooling_dev)); > + if (IS_ENABLED(CONFIG_THERMAL)) { > + cooling_dev = devm_thermal_of_cooling_device_register(dev, > + dev->of_node, client->name, > + data, &max6650_cooling_ops); > + if (IS_ERR(cooling_dev)) { > + dev_warn(dev, "thermal cooling device register failed: %ld\n", > + PTR_ERR(cooling_dev)); > + } > } > -#endif > + > return 0; > } >
diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c index 5fdad4645cca..3d9d371c35b5 100644 --- a/drivers/hwmon/max6650.c +++ b/drivers/hwmon/max6650.c @@ -467,8 +467,6 @@ static int max6650_init_client(struct max6650_data *data, return 0; } -#if IS_ENABLED(CONFIG_THERMAL) - static int max6650_get_max_state(struct thermal_cooling_device *cdev, unsigned long *state) { @@ -517,7 +515,6 @@ static const struct thermal_cooling_device_ops max6650_cooling_ops = { .get_cur_state = max6650_get_cur_state, .set_cur_state = max6650_set_cur_state, }; -#endif static int max6650_read(struct device *dev, enum hwmon_sensor_types type, u32 attr, int channel, long *val) @@ -795,14 +792,16 @@ static int max6650_probe(struct i2c_client *client, if (err) return err; -#if IS_ENABLED(CONFIG_THERMAL) - cooling_dev = devm_thermal_of_cooling_device_register(dev, dev->of_node, - client->name, data, &max6650_cooling_ops); - if (IS_ERR(cooling_dev)) { - dev_warn(dev, "thermal cooling device register failed: %ld\n", - PTR_ERR(cooling_dev)); + if (IS_ENABLED(CONFIG_THERMAL)) { + cooling_dev = devm_thermal_of_cooling_device_register(dev, + dev->of_node, client->name, + data, &max6650_cooling_ops); + if (IS_ERR(cooling_dev)) { + dev_warn(dev, "thermal cooling device register failed: %ld\n", + PTR_ERR(cooling_dev)); + } } -#endif + return 0; }
The newly added variable is only used in an #if block: drivers/hwmon/max6650.c: In function 'max6650_probe': drivers/hwmon/max6650.c:766:33: error: unused variable 'cooling_dev' [-Werror=unused-variable] Change the #if to if() so the compiler can see what is actually going on. Fixes: a8463754a5a9 ("hwmon: (max6650) Use devm function to register thermal device") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/hwmon/max6650.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) -- 2.20.0