Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a3f1d53 authored by kogiidena's avatar kogiidena Committed by Linus Torvalds
Browse files

rtc-rs5c313.c: error and warning are fixed 



Correct a compile error and warning.

Signed-off-by: default avatarkogiidena <kogiidena@eggplant.ddo.jp>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3e88c553

drivers/rtc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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.

drivers/rtc/rtc-rs5c313.c

+3 −3
Original line number Diff line number Diff line
@@ -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);
@@ -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);

}
@@ -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)