From: Thierry Reding <thierry.reding@gmail.com>
Date: Tue, 1 Apr 2014 12:00:52 +0000 (+0200)
Subject: Revert "pwm: pxa: Use of_match_ptr()"
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f409cd38334ce4d2b1b99fef00543de1695a281f;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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>
---

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[] = {
 	{ }
 };
 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,