| Message ID | 000d01cf4eef$13881770$3a984650$%han@samsung.com |
|---|---|
| State | Rejected |
| Headers | show |
On Thu, Apr 03, 2014 at 12:44:54PM +0900, Jingoo Han wrote: > Use of_match_ptr(), because of_match_ptr() returns NULL pointer > when CONFIG_OF is disabled. > > Signed-off-by: Jingoo Han <jg1.han@samsung.com> > --- > Changes since v1: > - Add of_match_ptr() to of_match_device() in order to fix compile error > when CONFIG_OF=n. > > drivers/pwm/pwm-pxa.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) I already fixed this in the PWM tree before submitting the 3.15 pull request. What I did was rather revert the original patch because given the use in pxa_pwm_get_id_dt() there isn't any real advantages to using of_match_ptr() anymore. Thierry
diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c index cd356d8..024e6a4 100644 --- a/drivers/pwm/pwm-pxa.c +++ b/drivers/pwm/pwm-pxa.c @@ -140,14 +140,13 @@ static const struct of_device_id pwm_of_match[] = { { } }; MODULE_DEVICE_TABLE(of, pwm_of_match); -#else -#define pwm_of_match NULL #endif static const struct platform_device_id *pxa_pwm_get_id_dt(struct device *dev) { - const struct of_device_id *id = of_match_device(pwm_of_match, dev); + const struct of_device_id *id; + id = of_match_device(of_match_ptr(pwm_of_match), dev); return id ? id->data : NULL; } @@ -228,7 +227,7 @@ static struct platform_driver pwm_driver = { .driver = { .name = "pxa25x-pwm", .owner = THIS_MODULE, - .of_match_table = pwm_of_match, + .of_match_table = of_match_ptr(pwm_of_match), }, .probe = pwm_probe, .remove = pwm_remove,
Use of_match_ptr(), because of_match_ptr() returns NULL pointer when CONFIG_OF is disabled. Signed-off-by: Jingoo Han <jg1.han@samsung.com> --- Changes since v1: - Add of_match_ptr() to of_match_device() in order to fix compile error when CONFIG_OF=n. drivers/pwm/pwm-pxa.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)