[1/1] thermal: exynos: Use of_match_ptr() macro

Message ID 1355307864-22194-1-git-send-email-sachin.kamat@linaro.org
State Accepted
Headers show

Commit Message

Sachin Kamat Dec. 12, 2012, 10:24 a.m.
This eliminates having an #ifdef returning NULL for the case
when OF is disabled.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/thermal/exynos_thermal.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

Comments

Zhang Rui Jan. 4, 2013, 7:36 a.m. | #1
On Wed, 2012-12-12 at 15:54 +0530, Sachin Kamat wrote:
> This eliminates having an #ifdef returning NULL for the case
> when OF is disabled.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>

applied to thermal-next.

thanks,
rui

> ---
>  drivers/thermal/exynos_thermal.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c
> index 7772d16..3f6a54a 100644
> --- a/drivers/thermal/exynos_thermal.c
> +++ b/drivers/thermal/exynos_thermal.c
> @@ -800,8 +800,6 @@ static const struct of_device_id exynos_tmu_match[] = {
>  	{},
>  };
>  MODULE_DEVICE_TABLE(of, exynos_tmu_match);
> -#else
> -#define  exynos_tmu_match NULL
>  #endif
>  
>  static struct platform_device_id exynos_tmu_driver_ids[] = {
> @@ -982,7 +980,7 @@ static struct platform_driver exynos_tmu_driver = {
>  		.name   = "exynos-tmu",
>  		.owner  = THIS_MODULE,
>  		.pm     = EXYNOS_TMU_PM,
> -		.of_match_table = exynos_tmu_match,
> +		.of_match_table = of_match_ptr(exynos_tmu_match),
>  	},
>  	.probe = exynos_tmu_probe,
>  	.remove	= __devexit_p(exynos_tmu_remove),

Patch

diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c
index 7772d16..3f6a54a 100644
--- a/drivers/thermal/exynos_thermal.c
+++ b/drivers/thermal/exynos_thermal.c
@@ -800,8 +800,6 @@  static const struct of_device_id exynos_tmu_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, exynos_tmu_match);
-#else
-#define  exynos_tmu_match NULL
 #endif
 
 static struct platform_device_id exynos_tmu_driver_ids[] = {
@@ -982,7 +980,7 @@  static struct platform_driver exynos_tmu_driver = {
 		.name   = "exynos-tmu",
 		.owner  = THIS_MODULE,
 		.pm     = EXYNOS_TMU_PM,
-		.of_match_table = exynos_tmu_match,
+		.of_match_table = of_match_ptr(exynos_tmu_match),
 	},
 	.probe = exynos_tmu_probe,
 	.remove	= __devexit_p(exynos_tmu_remove),