[1/1] pwm: pxa: Use of_match_ptr helper
diff mbox

Message ID 1387612250-7704-1-git-send-email-sachin.kamat@linaro.org
State Superseded
Headers show

Commit Message

Sachin Kamat Dec. 21, 2013, 7:50 a.m. UTC
Use the helper instead of defining NULL for CONFIG_OF
disabled case.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/pwm/pwm-pxa.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Sachin Kamat Jan. 13, 2014, 3:09 a.m. UTC | #1
On 21 December 2013 13:20, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> Use the helper instead of defining NULL for CONFIG_OF
> disabled case.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  drivers/pwm/pwm-pxa.c |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c
> index 3dc7c10bb7a0..5d25e4217542 100644
> --- a/drivers/pwm/pwm-pxa.c
> +++ b/drivers/pwm/pwm-pxa.c
> @@ -19,6 +19,7 @@
>  #include <linux/clk.h>
>  #include <linux/io.h>
>  #include <linux/pwm.h>
> +#include <linux/of.h>
>  #include <linux/of_device.h>
>
>  #include <asm/div64.h>
> @@ -140,13 +141,12 @@ 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)
>  {
> -       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 +228,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,
> --
> 1.7.9.5
>

Gentle ping.

Patch
diff mbox

diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c
index 3dc7c10bb7a0..5d25e4217542 100644
--- a/drivers/pwm/pwm-pxa.c
+++ b/drivers/pwm/pwm-pxa.c
@@ -19,6 +19,7 @@ 
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/pwm.h>
+#include <linux/of.h>
 #include <linux/of_device.h>
 
 #include <asm/div64.h>
@@ -140,13 +141,12 @@  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)
 {
-	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 +228,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,