Revert "pwm: pxa: Use of_match_ptr()"
authorThierry Reding <thierry.reding@gmail.com>
Tue, 1 Apr 2014 12:00:52 +0000 (14:00 +0200)
committerThierry Reding <thierry.reding@gmail.com>
Tue, 1 Apr 2014 12:01:32 +0000 (14:01 +0200)
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>
drivers/pwm/pwm-pxa.c

index 7eb2c181c25a45eb0f025eb17fbbf1ead8760e55..8d995731cef8d13a96f8168161a038c7446e3d5a 100644 (file)
@@ -140,6 +140,8 @@ 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)
@@ -226,7 +228,7 @@ static struct platform_driver pwm_driver = {
        .driver         = {
                .name   = "pxa25x-pwm",
                .owner  = THIS_MODULE,
-               .of_match_table = of_match_ptr(pwm_of_match),
+               .of_match_table = pwm_of_match,
        },
        .probe          = pwm_probe,
        .remove         = pwm_remove,