diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-02-21 19:44:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:22:27 -0500 |
commit | c8a6046e1e0bb03406e4fc6c0a204ef58a1868e4 (patch) | |
tree | c041260ad34e5b5924c6bc5b09e9042e6df77574 /drivers/rtc/rtc-cmos.c | |
parent | f32bc70d5f938cfef3e534c9db6d38a3759eac6d (diff) |
drivers/rtc: use of_match_ptr() macro
This eliminates having an #ifdef returning NULL for the case when OF is
disabled. Maintains consistency in cases where OF is always selected.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/rtc-cmos.c')
-rw-r--r-- | drivers/rtc/rtc-cmos.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 16630aa87f45..9deb9e47a67c 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c | |||
@@ -1098,7 +1098,6 @@ static __init void cmos_of_init(struct platform_device *pdev) | |||
1098 | } | 1098 | } |
1099 | #else | 1099 | #else |
1100 | static inline void cmos_of_init(struct platform_device *pdev) {} | 1100 | static inline void cmos_of_init(struct platform_device *pdev) {} |
1101 | #define of_cmos_match NULL | ||
1102 | #endif | 1101 | #endif |
1103 | /*----------------------------------------------------------------*/ | 1102 | /*----------------------------------------------------------------*/ |
1104 | 1103 | ||
@@ -1140,7 +1139,7 @@ static struct platform_driver cmos_platform_driver = { | |||
1140 | #ifdef CONFIG_PM | 1139 | #ifdef CONFIG_PM |
1141 | .pm = &cmos_pm_ops, | 1140 | .pm = &cmos_pm_ops, |
1142 | #endif | 1141 | #endif |
1143 | .of_match_table = of_cmos_match, | 1142 | .of_match_table = of_match_ptr(of_cmos_match), |
1144 | } | 1143 | } |
1145 | }; | 1144 | }; |
1146 | 1145 | ||