diff options
author | Joshua Kinard <kumba@gentoo.org> | 2015-04-16 15:45:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 09:04:00 -0400 |
commit | 52ef84d566dc145b4d469f06667c5fa3118fdd44 (patch) | |
tree | 6d376747ca2405e7f29e97863e2d5b8326da70aa /drivers/rtc | |
parent | 269812de8b1c28cd477a3f9cc9793047f0de530e (diff) |
drivers/rtc/rtc-ds1685.c: fix sparse warnings
Fix two minor sparse warnings:
CHECK drivers/rtc/rtc-ds1685.c
drivers/rtc/rtc-ds1685.c:2178:1: warning: function 'ds1685_rtc_poweroff' with external linkage has definition
drivers/rtc/rtc-ds1685.c:802:23: warning: Using plain integer as NULL pointer
Fixes: aaaf5fbf56f1 ("rtc: add driver for DS1685 family of real time clocks")
Signed-off-by: Joshua Kinard <kumba@gentoo.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-ds1685.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c index 7a7c8de7c92c..70202098a8ce 100644 --- a/drivers/rtc/rtc-ds1685.c +++ b/drivers/rtc/rtc-ds1685.c | |||
@@ -799,7 +799,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq) | |||
799 | struct platform_device *pdev = to_platform_device(dev); | 799 | struct platform_device *pdev = to_platform_device(dev); |
800 | struct ds1685_priv *rtc = platform_get_drvdata(pdev); | 800 | struct ds1685_priv *rtc = platform_get_drvdata(pdev); |
801 | u8 ctrla, ctrlb, ctrlc, ctrld, ctrl4a, ctrl4b, ssn[8]; | 801 | u8 ctrla, ctrlb, ctrlc, ctrld, ctrl4a, ctrl4b, ssn[8]; |
802 | char *model = '\0'; | 802 | char *model; |
803 | #ifdef CONFIG_RTC_DS1685_PROC_REGS | 803 | #ifdef CONFIG_RTC_DS1685_PROC_REGS |
804 | char bits[NUM_REGS][(NUM_BITS * NUM_SPACES) + NUM_BITS + 1]; | 804 | char bits[NUM_REGS][(NUM_BITS * NUM_SPACES) + NUM_BITS + 1]; |
805 | #endif | 805 | #endif |
@@ -2174,7 +2174,7 @@ module_exit(ds1685_rtc_exit); | |||
2174 | * ds1685_rtc_poweroff - uses the RTC chip to power the system off. | 2174 | * ds1685_rtc_poweroff - uses the RTC chip to power the system off. |
2175 | * @pdev: pointer to platform_device structure. | 2175 | * @pdev: pointer to platform_device structure. |
2176 | */ | 2176 | */ |
2177 | extern void __noreturn | 2177 | void __noreturn |
2178 | ds1685_rtc_poweroff(struct platform_device *pdev) | 2178 | ds1685_rtc_poweroff(struct platform_device *pdev) |
2179 | { | 2179 | { |
2180 | u8 ctrla, ctrl4a, ctrl4b; | 2180 | u8 ctrla, ctrl4a, ctrl4b; |