projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core/rodata' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...
[cascardo/linux.git]
/
drivers
/
rtc
/
rtc-at91rm9200.c
diff --git
a/drivers/rtc/rtc-at91rm9200.c
b/drivers/rtc/rtc-at91rm9200.c
index
52abffc
..
39e64ab
100644
(file)
--- a/
drivers/rtc/rtc-at91rm9200.c
+++ b/
drivers/rtc/rtc-at91rm9200.c
@@
-83,7
+83,7
@@
static int at91_rtc_readtime(struct device *dev, struct rtc_time *tm)
tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year);
tm->tm_year = tm->tm_year - 1900;
tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year);
tm->tm_year = tm->tm_year - 1900;
- pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __
FUNCTION
__,
+ pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __
func
__,
1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
@@
-97,7
+97,7
@@
static int at91_rtc_settime(struct device *dev, struct rtc_time *tm)
{
unsigned long cr;
{
unsigned long cr;
- pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __
FUNCTION
__,
+ pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __
func
__,
1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
@@
-142,7
+142,7
@@
static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)
alrm->enabled = (at91_sys_read(AT91_RTC_IMR) & AT91_RTC_ALARM)
? 1 : 0;
alrm->enabled = (at91_sys_read(AT91_RTC_IMR) & AT91_RTC_ALARM)
? 1 : 0;
- pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __
FUNCTION
__,
+ pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __
func
__,
1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
@@
-178,7
+178,7
@@
static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
if (alrm->enabled)
at91_sys_write(AT91_RTC_IER, AT91_RTC_ALARM);
if (alrm->enabled)
at91_sys_write(AT91_RTC_IER, AT91_RTC_ALARM);
- pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __
FUNCTION
__,
+ pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __
func
__,
at91_alarm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour,
tm.tm_min, tm.tm_sec);
at91_alarm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour,
tm.tm_min, tm.tm_sec);
@@
-193,7
+193,7
@@
static int at91_rtc_ioctl(struct device *dev, unsigned int cmd,
{
int ret = 0;
{
int ret = 0;
- pr_debug("%s(): cmd=%08x, arg=%08lx.\n", __
FUNCTION
__, cmd, arg);
+ pr_debug("%s(): cmd=%08x, arg=%08lx.\n", __
func
__, cmd, arg);
switch (cmd) {
case RTC_AIE_OFF: /* alarm off */
switch (cmd) {
case RTC_AIE_OFF: /* alarm off */
@@
-265,7
+265,7
@@
static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id)
rtc_update_irq(rtc, 1, events);
rtc_update_irq(rtc, 1, events);
- pr_debug("%s(): num=%ld, events=0x%02lx\n", __
FUNCTION
__,
+ pr_debug("%s(): num=%ld, events=0x%02lx\n", __
func
__,
events >> 8, events & 0x000000FF);
return IRQ_HANDLED;
events >> 8, events & 0x000000FF);
return IRQ_HANDLED;