aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pwm
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@gmail.com>2014-04-01 08:00:52 -0400
committerThierry Reding <thierry.reding@gmail.com>2014-04-01 08:01:32 -0400
commitf409cd38334ce4d2b1b99fef00543de1695a281f (patch)
tree8c3dc40920b048a85abda19a2152c6585919154f /drivers/pwm
parentd16a5aa9e821633a3095d7a88cd1d2cd108bf966 (diff)
Revert "pwm: pxa: Use of_match_ptr()"
This reverts commit 8468949cddcdbb1b1b1bc552aefceb252078ceb1. The OF match table dummy for non-OF configurations cannot be removed because it is still used by the pxa_pwm_get_id_dt() function. Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/pwm')
-rw-r--r--drivers/pwm/pwm-pxa.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c
index 7eb2c181c25a..8d995731cef8 100644
--- a/drivers/pwm/pwm-pxa.c
+++ b/drivers/pwm/pwm-pxa.c
@@ -140,6 +140,8 @@ static struct of_device_id pwm_of_match[] = {
140 { } 140 { }
141}; 141};
142MODULE_DEVICE_TABLE(of, pwm_of_match); 142MODULE_DEVICE_TABLE(of, pwm_of_match);
143#else
144#define pwm_of_match NULL
143#endif 145#endif
144 146
145static const struct platform_device_id *pxa_pwm_get_id_dt(struct device *dev) 147static const struct platform_device_id *pxa_pwm_get_id_dt(struct device *dev)
@@ -226,7 +228,7 @@ static struct platform_driver pwm_driver = {
226 .driver = { 228 .driver = {
227 .name = "pxa25x-pwm", 229 .name = "pxa25x-pwm",
228 .owner = THIS_MODULE, 230 .owner = THIS_MODULE,
229 .of_match_table = of_match_ptr(pwm_of_match), 231 .of_match_table = pwm_of_match,
230 }, 232 },
231 .probe = pwm_probe, 233 .probe = pwm_probe,
232 .remove = pwm_remove, 234 .remove = pwm_remove,