diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2014-08-08 23:20:07 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-09 00:57:19 +0200 |
| commit | 3710f597aca5af4f605cda9793a8b2f0a42bc29a (patch) | |
| tree | 2048f1da7e7038345d37b554894b62ddcd0e812d /drivers/rtc/rtc-ds1742.c | |
| parent | drivers/rtc/Kconfig: add hardware dependency to rtc-moxart (diff) | |
| download | linux-3710f597aca5af4f605cda9793a8b2f0a42bc29a.tar.xz linux-3710f597aca5af4f605cda9793a8b2f0a42bc29a.zip | |
drivers/rtc/rtc-ds1742.c: revert "drivers/rtc/rtc-ds1742.c: remove redundant of_match_ptr() helper"
Commit 5516f0971793 ("drivers/rtc/rtc-ds1742.c: remove redundant
of_match_ptr() helper") has description as: "'ds1742_rtc_of_match' is
always compiled in. Hence the helper macro is not needed".
It is not true, of_match_ptr() macro makes of_device_id parameter unused
and this constant is declared with __maybe_unused attribute, so normally
this variable should be discarded by linker. This patch revers this
commit, since there are no reason to compile of_device_id constant for
non-DT systems.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: 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/rtc-ds1742.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1742.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c index c6b2191a4128..9822715db8ba 100644 --- a/drivers/rtc/rtc-ds1742.c +++ b/drivers/rtc/rtc-ds1742.c @@ -231,7 +231,7 @@ static struct platform_driver ds1742_rtc_driver = { .driver = { .name = "rtc-ds1742", .owner = THIS_MODULE, - .of_match_table = ds1742_rtc_of_match, + .of_match_table = of_match_ptr(ds1742_rtc_of_match), }, }; |