From: Jingoo Han Date: Wed, 26 Feb 2014 01:17:13 +0000 (+0900) Subject: pwm: pxa: Use of_match_ptr() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8468949cddcdbb1b1b1bc552aefceb252078ceb1;p=deliverable%2Flinux.git pwm: pxa: Use of_match_ptr() Use of_match_ptr(), because of_match_ptr() returns NULL pointer when CONFIG_OF is disabled. Signed-off-by: Jingoo Han Signed-off-by: Thierry Reding --- diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c index 8d995731cef8..7eb2c181c25a 100644 --- a/drivers/pwm/pwm-pxa.c +++ b/drivers/pwm/pwm-pxa.c @@ -140,8 +140,6 @@ static 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) @@ -228,7 +226,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,