OSDN Git Service

rtc: rtc-cmos: use dev_warn()/dev_dbg() instead of printk()/pr_debug()
authorJingoo Han <jg1.han@samsung.com>
Fri, 22 Feb 2013 00:45:34 +0000 (16:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Feb 2013 01:22:29 +0000 (17:22 -0800)
Fix the checkpatch warning as below:

  WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/rtc/rtc-cmos.c

index 9deb9e4..af97c94 100644 (file)
@@ -706,7 +706,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
                        rtc_cmos_int_handler = hpet_rtc_interrupt;
                        err = hpet_register_irq_handler(cmos_interrupt);
                        if (err != 0) {
-                               printk(KERN_WARNING "hpet_register_irq_handler "
+                               dev_warn(dev, "hpet_register_irq_handler "
                                                " failed in rtc_init().");
                                goto cleanup1;
                        }
@@ -731,8 +731,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
                goto cleanup2;
        }
 
-       pr_info("%s: %s%s, %zd bytes nvram%s\n",
-               dev_name(&cmos_rtc.rtc->dev),
+       dev_info(dev, "%s%s, %zd bytes nvram%s\n",
                !is_valid_irq(rtc_irq) ? "no alarms" :
                        cmos_rtc.mon_alrm ? "alarms up to one year" :
                        cmos_rtc.day_alrm ? "alarms up to one month" :
@@ -820,8 +819,7 @@ static int cmos_suspend(struct device *dev)
                        enable_irq_wake(cmos->irq);
        }
 
-       pr_debug("%s: suspend%s, ctrl %02x\n",
-                       dev_name(&cmos_rtc.rtc->dev),
+       dev_dbg(dev, "suspend%s, ctrl %02x\n",
                        (tmp & RTC_AIE) ? ", alarm may wake" : "",
                        tmp);
 
@@ -876,9 +874,7 @@ static int cmos_resume(struct device *dev)
                spin_unlock_irq(&rtc_lock);
        }
 
-       pr_debug("%s: resume, ctrl %02x\n",
-                       dev_name(&cmos_rtc.rtc->dev),
-                       tmp);
+       dev_dbg(dev, "resume, ctrl %02x\n", tmp);
 
        return 0;
 }