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

Commit f1226701 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] rtc-sa1100: fix compiler warnings and error cleanup 



Fix:
drivers/rtc/rtc-sa1100.c: In function `sa1100_rtc_proc':
drivers/rtc/rtc-sa1100.c:298: warning: unsigned int format, long unsigned int arg (arg 3)

and arrange for sa1100_rtc_open() to pass the devid to free_irq()
rather than NULL.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 19ca5d27

drivers/rtc/rtc-sa1100.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -178,9 +178,9 @@ static int sa1100_rtc_open(struct device *dev) 
	return 0;

	return 0;





 fail_pi:

 fail_pi:

	free_irq(IRQ_RTCAlrm, NULL);

	free_irq(IRQ_RTCAlrm, dev);

 fail_ai:

 fail_ai:

	free_irq(IRQ_RTC1Hz, NULL);

	free_irq(IRQ_RTC1Hz, dev);

 fail_ui:

 fail_ui:

	return ret;

	return ret;

}

}
@@ -295,7 +295,7 @@ static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) 




static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq)

static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq)

{

{

	seq_printf(seq, "trim/divider\t: 0x%08x\n", RTTR);

	seq_printf(seq, "trim/divider\t: 0x%08lx\n", RTTR);

	seq_printf(seq, "alarm_IRQ\t: %s\n",

	seq_printf(seq, "alarm_IRQ\t: %s\n",

			(RTSR & RTSR_ALE) ? "yes" : "no" );

			(RTSR & RTSR_ALE) ? "yes" : "no" );

	seq_printf(seq, "update_IRQ\t: %s\n",

	seq_printf(seq, "update_IRQ\t: %s\n",