Skip to content

Commit

Permalink
rtc-rs5c313.c: error and warning are fixed
Browse files Browse the repository at this point in the history
Correct a compile error and warning.

Signed-off-by: kogiidena <kogiidena@eggplant.ddo.jp>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
kogiidena authored and Linus Torvalds committed May 11, 2007
1 parent 3e88c55 commit 9a3f1d5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/rtc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,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.

Expand Down
6 changes: 3 additions & 3 deletions drivers/rtc/rtc-rs5c313.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ static void rs5c313_write_data(unsigned char data)
static unsigned char rs5c313_read_data(void)
{
int i;
unsigned char data;
unsigned char data = 0;

for (i = 0; i < 8; i++) {
ndelay(700);
Expand Down Expand Up @@ -194,7 +194,7 @@ static void rs5c313_write_reg(unsigned char addr, unsigned char data)
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);
}
Expand Down Expand Up @@ -356,7 +356,7 @@ static int rs5c313_rtc_probe(struct platform_device *pdev)

platform_set_drvdata(pdev, rtc);

return err;
return 0;
}

static int __devexit rs5c313_rtc_remove(struct platform_device *pdev)
Expand Down

0 comments on commit 9a3f1d5

Please sign in to comment.