diff options
Diffstat (limited to 'drivers/rtc/rtc-puv3.c')
| -rw-r--r-- | drivers/rtc/rtc-puv3.c | 22 | 
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/rtc/rtc-puv3.c b/drivers/rtc/rtc-puv3.c index 402732cfb32..1cff2a21db6 100644 --- a/drivers/rtc/rtc-puv3.c +++ b/drivers/rtc/rtc-puv3.c @@ -53,11 +53,11 @@ static irqreturn_t puv3_rtc_tickirq(int irq, void *id)  }  /* Update control registers */ -static void puv3_rtc_setaie(int to) +static void puv3_rtc_setaie(struct device *dev, int to)  {  	unsigned int tmp; -	pr_debug("%s: aie=%d\n", __func__, to); +	dev_dbg(dev, "%s: aie=%d\n", __func__, to);  	tmp = readl(RTC_RTSR) & ~RTC_RTSR_ALE; @@ -71,7 +71,7 @@ static int puv3_rtc_setpie(struct device *dev, int enabled)  {  	unsigned int tmp; -	pr_debug("%s: pie=%d\n", __func__, enabled); +	dev_dbg(dev, "%s: pie=%d\n", __func__, enabled);  	spin_lock_irq(&puv3_rtc_pie_lock);  	tmp = readl(RTC_RTSR) & ~RTC_RTSR_HZE; @@ -90,7 +90,7 @@ static int puv3_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)  {  	rtc_time_to_tm(readl(RTC_RCNR), rtc_tm); -	pr_debug("read time %02x.%02x.%02x %02x/%02x/%02x\n", +	dev_dbg(dev, "read time %02x.%02x.%02x %02x/%02x/%02x\n",  		 rtc_tm->tm_year, rtc_tm->tm_mon, rtc_tm->tm_mday,  		 rtc_tm->tm_hour, rtc_tm->tm_min, rtc_tm->tm_sec); @@ -101,7 +101,7 @@ static int puv3_rtc_settime(struct device *dev, struct rtc_time *tm)  {  	unsigned long rtc_count = 0; -	pr_debug("set time %02d.%02d.%02d %02d/%02d/%02d\n", +	dev_dbg(dev, "set time %02d.%02d.%02d %02d/%02d/%02d\n",  		 tm->tm_year, tm->tm_mon, tm->tm_mday,  		 tm->tm_hour, tm->tm_min, tm->tm_sec); @@ -119,7 +119,7 @@ static int puv3_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)  	alrm->enabled = readl(RTC_RTSR) & RTC_RTSR_ALE; -	pr_debug("read alarm %02x %02x.%02x.%02x %02x/%02x/%02x\n", +	dev_dbg(dev, "read alarm %02x %02x.%02x.%02x %02x/%02x/%02x\n",  		 alrm->enabled,  		 alm_tm->tm_year, alm_tm->tm_mon, alm_tm->tm_mday,  		 alm_tm->tm_hour, alm_tm->tm_min, alm_tm->tm_sec); @@ -132,7 +132,7 @@ static int puv3_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)  	struct rtc_time *tm = &alrm->time;  	unsigned long rtcalarm_count = 0; -	pr_debug("puv3_rtc_setalarm: %d, %02x/%02x/%02x %02x.%02x.%02x\n", +	dev_dbg(dev, "puv3_rtc_setalarm: %d, %02x/%02x/%02x %02x.%02x.%02x\n",  		 alrm->enabled,  		 tm->tm_mday & 0xff, tm->tm_mon & 0xff, tm->tm_year & 0xff,  		 tm->tm_hour & 0xff, tm->tm_min & 0xff, tm->tm_sec); @@ -140,7 +140,7 @@ static int puv3_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)  	rtc_tm_to_time(tm, &rtcalarm_count);  	writel(rtcalarm_count, RTC_RTAR); -	puv3_rtc_setaie(alrm->enabled); +	puv3_rtc_setaie(dev, alrm->enabled);  	if (alrm->enabled)  		enable_irq_wake(puv3_rtc_alarmno); @@ -227,7 +227,7 @@ static int puv3_rtc_remove(struct platform_device *dev)  	rtc_device_unregister(rtc);  	puv3_rtc_setpie(&dev->dev, 0); -	puv3_rtc_setaie(0); +	puv3_rtc_setaie(&dev->dev, 0);  	release_resource(puv3_rtc_mem);  	kfree(puv3_rtc_mem); @@ -241,7 +241,7 @@ static int puv3_rtc_probe(struct platform_device *pdev)  	struct resource *res;  	int ret; -	pr_debug("%s: probe=%p\n", __func__, pdev); +	dev_dbg(&pdev->dev, "%s: probe=%p\n", __func__, pdev);  	/* find the IRQs */  	puv3_rtc_tickno = platform_get_irq(pdev, 1); @@ -256,7 +256,7 @@ static int puv3_rtc_probe(struct platform_device *pdev)  		return -ENOENT;  	} -	pr_debug("PKUnity_rtc: tick irq %d, alarm irq %d\n", +	dev_dbg(&pdev->dev, "PKUnity_rtc: tick irq %d, alarm irq %d\n",  		 puv3_rtc_tickno, puv3_rtc_alarmno);  	/* get the memory region */  | 
