Re: [PATCH] watchdog: s3c2410-wdt: Use of_match_ptr().

MyungJoo Ham <myungjoo.ham@xxxxxxxxxxx> · Thu, 03 May 2012 01:00:38 +0000 (GMT)

> Use of_match_ptr definition for the of_match_table.
> 
> Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>
> 
> ---
> 
> Can someone compile test this?
> 
> Thanks,
> Wim.

I get this error. You probably need to add #include.

scripts/kconfig/conf --silentoldconfig Kconfig
  CHK     include/linux/version.h
  CHK     include/generated/utsrelease.h
make[1]: `include/generated/mach-types.h' is up to date.
  CALL    scripts/checksyscalls.sh
  CHK     include/generated/compile.h
  CC      drivers/watchdog/watchdog_core.o
  CC      drivers/watchdog/watchdog_dev.o
  CC      drivers/watchdog/s3c2410_wdt.o
  LD      drivers/watchdog/watchdog.o
drivers/watchdog/s3c2410_wdt.c:517:3: error: implicit declaration of function ‘of_match_ptr’
drivers/watchdog/s3c2410_wdt.c:517:34: error: ‘s3c2410_wdt_match’ undeclared here (not in a function)
make[2]: *** [drivers/watchdog/s3c2410_wdt.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [drivers/watchdog] Error 2
make: *** [drivers] Error 2

> 
> diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
> index 04e5a6d..686c8fc 100644
> --- a/drivers/watchdog/s3c2410_wdt.c
> +++ b/drivers/watchdog/s3c2410_wdt.c
> @@ -503,8 +503,6 @@ static const struct of_device_id s3c2410_wdt_match[] = {
>  	{},
>  };
>  MODULE_DEVICE_TABLE(of, s3c2410_wdt_match);
> -#else
> -#define s3c2410_wdt_match NULL
>  #endif
>  
>  static struct platform_driver s3c2410wdt_driver = {
> @@ -516,7 +514,7 @@ static struct platform_driver s3c2410wdt_driver = {
>  	.driver		= {
>  		.owner	= THIS_MODULE,
>  		.name	= "s3c2410-wdt",
> -		.of_match_table	= s3c2410_wdt_match,
> +		.of_match_table	= of_match_ptr(s3c2410_wdt_match),
>  	},
>  };
>  
> 
> 
> 
>        
>   
>          
> 
ÿ淸º{.nÇ+돴윯돪†+%듚ÿ깁負¥Šwÿº{.nÇ+돴¥Š{±ÿrh껟㎍썳變}©옽Æ zÚ&j:+v돣?®w?듺2듷솳鈺Ú&¢)傘«a뛴ÿÿ鎬z요z받쀺+껠šŽ듶¢jÿŠw療f