diff options
Diffstat (limited to 'drivers/rtc/rtc-at91rm9200.c')
-rw-r--r-- | drivers/rtc/rtc-at91rm9200.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c index b6469e2cae89..434ebc3a99dc 100644 --- a/drivers/rtc/rtc-at91rm9200.c +++ b/drivers/rtc/rtc-at91rm9200.c | |||
@@ -86,7 +86,7 @@ static int at91_rtc_readtime(struct device *dev, struct rtc_time *tm) | |||
86 | tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year); | 86 | tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year); |
87 | tm->tm_year = tm->tm_year - 1900; | 87 | tm->tm_year = tm->tm_year - 1900; |
88 | 88 | ||
89 | pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__, | 89 | dev_dbg(dev, "%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__, |
90 | 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday, | 90 | 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday, |
91 | tm->tm_hour, tm->tm_min, tm->tm_sec); | 91 | tm->tm_hour, tm->tm_min, tm->tm_sec); |
92 | 92 | ||
@@ -100,7 +100,7 @@ static int at91_rtc_settime(struct device *dev, struct rtc_time *tm) | |||
100 | { | 100 | { |
101 | unsigned long cr; | 101 | unsigned long cr; |
102 | 102 | ||
103 | pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__, | 103 | dev_dbg(dev, "%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__, |
104 | 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday, | 104 | 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday, |
105 | tm->tm_hour, tm->tm_min, tm->tm_sec); | 105 | tm->tm_hour, tm->tm_min, tm->tm_sec); |
106 | 106 | ||
@@ -145,7 +145,7 @@ static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
145 | alrm->enabled = (at91_rtc_read(AT91_RTC_IMR) & AT91_RTC_ALARM) | 145 | alrm->enabled = (at91_rtc_read(AT91_RTC_IMR) & AT91_RTC_ALARM) |
146 | ? 1 : 0; | 146 | ? 1 : 0; |
147 | 147 | ||
148 | pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__, | 148 | dev_dbg(dev, "%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__, |
149 | 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday, | 149 | 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday, |
150 | tm->tm_hour, tm->tm_min, tm->tm_sec); | 150 | tm->tm_hour, tm->tm_min, tm->tm_sec); |
151 | 151 | ||
@@ -183,7 +183,7 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
183 | at91_rtc_write(AT91_RTC_IER, AT91_RTC_ALARM); | 183 | at91_rtc_write(AT91_RTC_IER, AT91_RTC_ALARM); |
184 | } | 184 | } |
185 | 185 | ||
186 | pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__, | 186 | dev_dbg(dev, "%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__, |
187 | at91_alarm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour, | 187 | at91_alarm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour, |
188 | tm.tm_min, tm.tm_sec); | 188 | tm.tm_min, tm.tm_sec); |
189 | 189 | ||
@@ -192,7 +192,7 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
192 | 192 | ||
193 | static int at91_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) | 193 | static int at91_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) |
194 | { | 194 | { |
195 | pr_debug("%s(): cmd=%08x\n", __func__, enabled); | 195 | dev_dbg(dev, "%s(): cmd=%08x\n", __func__, enabled); |
196 | 196 | ||
197 | if (enabled) { | 197 | if (enabled) { |
198 | at91_rtc_write(AT91_RTC_SCCR, AT91_RTC_ALARM); | 198 | at91_rtc_write(AT91_RTC_SCCR, AT91_RTC_ALARM); |
@@ -240,7 +240,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id) | |||
240 | 240 | ||
241 | rtc_update_irq(rtc, 1, events); | 241 | rtc_update_irq(rtc, 1, events); |
242 | 242 | ||
243 | pr_debug("%s(): num=%ld, events=0x%02lx\n", __func__, | 243 | dev_dbg(&pdev->dev, "%s(): num=%ld, events=0x%02lx\n", __func__, |
244 | events >> 8, events & 0x000000FF); | 244 | events >> 8, events & 0x000000FF); |
245 | 245 | ||
246 | return IRQ_HANDLED; | 246 | return IRQ_HANDLED; |
@@ -296,8 +296,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev) | |||
296 | IRQF_SHARED, | 296 | IRQF_SHARED, |
297 | "at91_rtc", pdev); | 297 | "at91_rtc", pdev); |
298 | if (ret) { | 298 | if (ret) { |
299 | printk(KERN_ERR "at91_rtc: IRQ %d already in use.\n", | 299 | dev_err(&pdev->dev, "IRQ %d already in use.\n", irq); |
300 | irq); | ||
301 | return ret; | 300 | return ret; |
302 | } | 301 | } |
303 | 302 | ||
@@ -315,7 +314,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev) | |||
315 | } | 314 | } |
316 | platform_set_drvdata(pdev, rtc); | 315 | platform_set_drvdata(pdev, rtc); |
317 | 316 | ||
318 | printk(KERN_INFO "AT91 Real Time Clock driver.\n"); | 317 | dev_info(&pdev->dev, "AT91 Real Time Clock driver.\n"); |
319 | return 0; | 318 | return 0; |
320 | } | 319 | } |
321 | 320 | ||