diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2012-12-17 19:02:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 20:15:21 -0500 |
commit | 04a373fdc9b0cbb4f076dd0e6c6433dc3bc48724 (patch) | |
tree | 14df26c7c316a9ddfacd43f3942016b91989a4d5 /drivers/rtc | |
parent | 18c701a9dbe91768e1629f1aece9d50543b3abfa (diff) |
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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-s3c.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index e33df1bfe27e..4bd9414aee65 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c | |||
@@ -663,8 +663,6 @@ static const struct of_device_id s3c_rtc_dt_match[] = { | |||
663 | {}, | 663 | {}, |
664 | }; | 664 | }; |
665 | MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match); | 665 | MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match); |
666 | #else | ||
667 | #define s3c_rtc_dt_match NULL | ||
668 | #endif | 666 | #endif |
669 | 667 | ||
670 | static struct platform_device_id s3c_rtc_driver_ids[] = { | 668 | static struct platform_device_id s3c_rtc_driver_ids[] = { |
@@ -695,7 +693,7 @@ static struct platform_driver s3c_rtc_driver = { | |||
695 | .driver = { | 693 | .driver = { |
696 | .name = "s3c-rtc", | 694 | .name = "s3c-rtc", |
697 | .owner = THIS_MODULE, | 695 | .owner = THIS_MODULE, |
698 | .of_match_table = s3c_rtc_dt_match, | 696 | .of_match_table = of_match_ptr(s3c_rtc_dt_match), |
699 | }, | 697 | }, |
700 | }; | 698 | }; |
701 | 699 | ||