Skip to contentSkip to conversation

watchdog: s3c2410-wdt: Use of_match_ptr().

PATCH MyungJoo Ham 2 participants 2 messages May 3, 2012 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw
Quoted 11 lines

Use of_match_ptr definition for the of_match_table.

---

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

Quoted 30 lines
drivers/watchdog/s3c2410_wdt.c +1 -3
index 04e5a6d..686c8fc 100644
@@ -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),
 	},
 };
 
#1 lore raw

Hi,

Quoted 25 lines
Quoted 11 lines

Use of_match_ptr definition for the of_match_table.

---

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
Quoted 6 lines

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

Can you try with: #include <linux/of.h> ?

Thanks,
Wim.

--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html