Linux MM tree latest commits
 help / color / mirror / Atom feed
* + drivers-rtc-rtc-s3c-use-of_match_ptr-macro.patch added to -mm tree
@ 2012-12-12 20:51 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2012-12-12 20:51 UTC (permalink / raw)
  To: mm-commits; +Cc: sachin.kamat


The patch titled
     Subject: drivers/rtc/rtc-s3c: use of_match_ptr() macro
has been added to the -mm tree.  Its filename is
     drivers-rtc-rtc-s3c-use-of_match_ptr-macro.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Sachin Kamat <sachin.kamat@linaro.org>
Subject: drivers/rtc/rtc-s3c: use of_match_ptr() macro

This eliminates having an #ifdef returning NULL for the case when OF is
disabled.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/rtc/rtc-s3c.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff -puN drivers/rtc/rtc-s3c.c~drivers-rtc-rtc-s3c-use-of_match_ptr-macro drivers/rtc/rtc-s3c.c
--- a/drivers/rtc/rtc-s3c.c~drivers-rtc-rtc-s3c-use-of_match_ptr-macro
+++ a/drivers/rtc/rtc-s3c.c
@@ -695,8 +695,6 @@ static const struct of_device_id s3c_rtc
 	{},
 };
 MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match);
-#else
-#define s3c_rtc_dt_match NULL
 #endif
 
 static struct platform_device_id s3c_rtc_driver_ids[] = {
@@ -727,7 +725,7 @@ static struct platform_driver s3c_rtc_dr
 	.driver		= {
 		.name	= "s3c-rtc",
 		.owner	= THIS_MODULE,
-		.of_match_table	= s3c_rtc_dt_match,
+		.of_match_table	= of_match_ptr(s3c_rtc_dt_match),
 	},
 };
 
_

Patches currently in -mm which might be from sachin.kamat@linaro.org are

origin.patch
linux-next.patch
drivers-video-console-softcursorc-remove-redundant-null-check-before-kfree.patch
rtc-remove-unused-code-from-rtc-devc.patch
drivers-rtc-rtc-s3c-use-of_match_ptr-macro.patch


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2012-12-12 20:51 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-12 20:51 + drivers-rtc-rtc-s3c-use-of_match_ptr-macro.patch added to -mm tree akpm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox