hwmon: (pwm-fan) Add proper #ifdef CONFIG_OF guard for of_device_id table
PATCH 2/2 hwmon: (pwm-fan) Add proper #ifdef CONFIG_OF guard for of_device_id table
Use of_match_ptr and proper #ifdef CONFIG_OF guard for of_device_id table. Also makes of_pwm_fan_match const.
--- drivers/hwmon/pwm-fan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/hwmon/pwm-fan.c +4 -2
@@ -170,10 +170,12 @@ static int pwm_fan_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(pwm_fan_pm, pwm_fan_suspend, pwm_fan_resume); -static struct of_device_id of_pwm_fan_match[] = { +#ifdef CONFIG_OF +static const struct of_device_id of_pwm_fan_match[] = { { .compatible ="pwm-fan" , }, {}, }; +#endif static struct platform_driver pwm_fan_driver = { .probe = pwm_fan_probe,
@@ -181,7 +183,7 @@ static struct platform_driver pwm_fan_driver = { .driver = { .name = "pwm-fan", .pm = &pwm_fan_pm, - .of_match_table = of_pwm_fan_match, + .of_match_table = of_match_ptr(of_pwm_fan_match), }, };
Signature · 9 lines
1.9.1 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Guenter Roeck
maintainerRe: [lm-sensors] [PATCH 2/2] hwmon: (pwm-fan) Add proper #ifdef CONFIG_OF guard for of_device_id tab
Quoted 4 lines · Axel Lin
Use
of_match_ptrand proper #ifdefCONFIG_OFguard forof_device_idtable. Also makesof_pwm_fan_matchconst.Signed-off-by Axel Lin <[email protected]>
The driver won't instantiate if OF is not configured. Given that, I'd rather keep the code as is, because it does compile without CONFIG_OF, so the ifdef is not really technically necessary.
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Re: [lm-sensors] [PATCH 2/2] hwmon: (pwm-fan) Add proper #ifdef CONFIG_OF guard for of_device_id tab
In reply to Axel Lin2014-07-25 12:29 GMT+08:00 Guenter Roeck <[email protected]>:
Quoted 9 lines · Axel Lin
Quoted 5 lines
Use
of_match_ptrand proper #ifdefCONFIG_OFguard forof_device_idtable. Also makesof_pwm_fan_matchconst.Signed-off-by Axel Lin <[email protected]>The driver won't instantiate if OF is not configured.
You are right.
Then how about adding OF dependency to config SENSORS_PWM_FAN?
Thanks,
Axel
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Guenter Roeck
maintainerRe: [lm-sensors] [PATCH 2/2] hwmon: (pwm-fan) Add proper #ifdef CONFIG_OF guard for of_device_id tab
In reply to Axel LinQuoted 6 lines · Axel Lin
2014-07-25 12:29 GMT+08:00 Guenter Roeck <[email protected]>:
Quoted 5 lines · Axel Lin
Quoted 4 lines
Use
of_match_ptrand proper #ifdefCONFIG_OFguard forof_device_idtable. Also makesof_pwm_fan_matchconst.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Axel Lin <[email protected]>The driver won't instantiate if OF is not configured.
You are right.
Then how about adding OF dependency to configSENSORS_PWM_FAN?
Then it won't compile with allmodconfig on x86. I prefer to be able to compile it. So we would have to add COMPILE_TEST as secondary dependency, and things would get more and more complex. Not really sure if I want to go along that route.
Jean, any thoughts ?
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Re: [lm-sensors] [PATCH 2/2] hwmon: (pwm-fan) Add proper #ifdef CONFIG_OF guard for of_device_id tab
In reply to Axel LinHi Guenter, Axel,
Quoted 6 lines · Guenter Roeck
Quoted 4 lines · Axel Lin
2014-07-25 12:29 GMT+08:00 Guenter Roeck <[email protected]>:
Quoted 1 line
The driver won't instantiate if OF is not configured.
You are right.
Then how about adding OF dependency to configSENSORS_PWM_FAN?
Quoted 6 lines
Then it won't compile with allmodconfig on x86. I prefer to be able to compile it. So we would have to add
COMPILE_TESTas secondary dependency, and things would get more and more complex. Not really sure if I want to go along that route.Jean, any thoughts ?
depends on OF || COMPILE_TEST
is good and not complex at all, just do that :) Note that you can put this on a line on its own, this is the recommended way to keep functional (build-time) dependencies and run-time dependencies clearly separated.
FWIW I have been speaking loudly in various occasions in favor of generalizing the use of run-time dependencies in combination with COMPILE_TEST. So I would be very happy if the hwmon subsystem goes down that road too.
Signature · 7 lines
Jean Delvare SUSE L3 Support _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Guenter Roeck
maintainerRe: [lm-sensors] [PATCH 2/2] hwmon: (pwm-fan) Add proper #ifdef CONFIG_OF guard for of_device_id tab
In reply to Axel LinQuoted 14 lines · Jean Delvare
Hi Guenter, Axel,
Quoted 11 lines · Guenter Roeck
Quoted 4 lines · Axel Lin
2014-07-25 12:29 GMT+08:00 Guenter Roeck <[email protected]>:
Quoted 1 line
The driver won't instantiate if OF is not configured.
You are right.
Then how about adding OF dependency to configSENSORS_PWM_FAN?Then it won't compile with allmodconfig on x86. I prefer to be able to compile it. So we would have to add
COMPILE_TESTas secondary dependency, and things would get more and more complex. Not really sure if I want to go along that route.
Quoted 9 lines
Quoted 1 line
Jean, any thoughts ?
depends on OF ||
COMPILE_TESTis good and not complex at all, just do that :) Note that you can put this on a line on its own, this is the recommended way to keep functional (build-time) dependencies and run-time dependencies clearly separated.
Ok. Axel, please send a patch.
Thanks,
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors