The patch titled
rtc-rs5c313.c: error and warning are fixed
has been added to the -mm tree. Its filename is
rtc-rs5c313c-error-and-warning-are-fixed.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: rtc-rs5c313.c: error and warning are fixed
From: "kogiidena" <kogiidena@xxxxxxxxxxxxxxx>
Correct a compile error and warning.
Signed-off-by: kogiidena <kogiidena@xxxxxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/Kconfig | 2 +-
drivers/rtc/rtc-rs5c313.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff -puN drivers/rtc/Kconfig~rtc-rs5c313c-error-and-warning-are-fixed drivers/rtc/Kconfig
--- a/drivers/rtc/Kconfig~rtc-rs5c313c-error-and-warning-are-fixed
+++ a/drivers/rtc/Kconfig
@@ -396,7 +396,7 @@ config RTC_DRV_BFIN
config RTC_DRV_RS5C313
tristate "Ricoh RS5C313"
- depends on RTC_CLASS && BROKEN
+ depends on RTC_CLASS && SH_LANDISK
help
If you say yes here you get support for the Ricoh RS5C313 RTC chips.
diff -puN drivers/rtc/rtc-rs5c313.c~rtc-rs5c313c-error-and-warning-are-fixed drivers/rtc/rtc-rs5c313.c
--- a/drivers/rtc/rtc-rs5c313.c~rtc-rs5c313c-error-and-warning-are-fixed
+++ a/drivers/rtc/rtc-rs5c313.c
@@ -126,7 +126,7 @@ static void rs5c313_write_data(unsigned
static unsigned char rs5c313_read_data(void)
{
int i;
- unsigned char data;
+ unsigned char data = 0;
for (i = 0; i < 8; i++) {
ndelay(700);
@@ -194,7 +194,7 @@ static void rs5c313_write_reg(unsigned c
return;
}
-static inline unsigned char rs5c313_read_cntreg(unsigned char addr)
+static inline unsigned char rs5c313_read_cntreg(void)
{
return rs5c313_read_reg(RS5C313_ADDR_CNTREG);
}
@@ -356,7 +356,7 @@ static int rs5c313_rtc_probe(struct plat
platform_set_drvdata(pdev, rtc);
- return err;
+ return 0;
}
static int __devexit rs5c313_rtc_remove(struct platform_device *pdev)
_
Patches currently in -mm which might be from kogiidena@xxxxxxxxxxxxxxx are
origin.patch
rtc-rs5c313c-error-and-warning-are-fixed.patch
rtcrtc-rs5c313c-rtc_time-value-are-fixed.patch
rtcrtc-rs5c313c-add-error-handling-toavoidhardware.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
