Re: [PATCH 2/2] thermal: db8500: Use of_match_ptr() macro in db8500_cpufreq_cooling.c

[Zhang Rui <rui.zhang@intel.com>]

On Wed, 2012-12-19 at 14:20 +0530, Sachin Kamat wrote:
> This eliminates having an #ifdef returning NULL for the case
> when OF is disabled.
> 
> Cc: Hongbo Zhang <hongbo.zhang@stericsson.com>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>

applied to thermal-next.

thanks,
rui

> ---
> Compile tested on linux-next.
> ---
>  drivers/thermal/db8500_cpufreq_cooling.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/thermal/db8500_cpufreq_cooling.c b/drivers/thermal/db8500_cpufreq_cooling.c
> index 4cf8e72..2141985 100644
> --- a/drivers/thermal/db8500_cpufreq_cooling.c
> +++ b/drivers/thermal/db8500_cpufreq_cooling.c
> @@ -21,6 +21,7 @@
>  #include <linux/cpufreq.h>
>  #include <linux/err.h>
>  #include <linux/module.h>
> +#include <linux/of.h>
>  #include <linux/platform_device.h>
>  #include <linux/slab.h>
>  
> @@ -73,15 +74,13 @@ static const struct of_device_id db8500_cpufreq_cooling_match[] = {
>  	{ .compatible = "stericsson,db8500-cpufreq-cooling" },
>  	{},
>  };
> -#else
> -#define db8500_cpufreq_cooling_match NULL
>  #endif
>  
>  static struct platform_driver db8500_cpufreq_cooling_driver = {
>  	.driver = {
>  		.owner = THIS_MODULE,
>  		.name = "db8500-cpufreq-cooling",
> -		.of_match_table = db8500_cpufreq_cooling_match,
> +		.of_match_table = of_match_ptr(db8500_cpufreq_cooling_match),
>  	},
>  	.probe = db8500_cpufreq_cooling_probe,
>  	.suspend = db8500_cpufreq_cooling_suspend,