diff options
| author | Alexander Gordeev <lasaine@lvk.cs.msu.su> | 2011-01-12 17:00:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 08:03:19 -0800 |
| commit | 7f7cce74105adf714bdc9357da3b6f06e019958c (patch) | |
| tree | 1fcb692726c5bf91280bcac5a65584eddcd93bf6 /drivers/pps/clients | |
| parent | 5e196d34a776420278e4117b4742cd9d3f2350ed (diff) | |
| download | linux-3.10-7f7cce74105adf714bdc9357da3b6f06e019958c.tar.gz linux-3.10-7f7cce74105adf714bdc9357da3b6f06e019958c.tar.bz2 linux-3.10-7f7cce74105adf714bdc9357da3b6f06e019958c.zip | |
pps: convert printk/pr_* to dev_*
Since we now have direct pointers to struct pps_device everywhere it's
easy to use dev_* functions to print messages instead of plain printks.
Where dev_* cannot be used printks are converted to pr_*.
Signed-off-by: Alexander Gordeev <lasaine@lvk.cs.msu.su>
Acked-by: Rodolfo Giometti <giometti@linux.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pps/clients')
| -rw-r--r-- | drivers/pps/clients/pps-ktimer.c | 5 | ||||
| -rw-r--r-- | drivers/pps/clients/pps-ldisc.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/pps/clients/pps-ktimer.c b/drivers/pps/clients/pps-ktimer.c index 966ead188ee..2728469d388 100644 --- a/drivers/pps/clients/pps-ktimer.c +++ b/drivers/pps/clients/pps-ktimer.c @@ -19,6 +19,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/kernel.h> #include <linux/module.h> @@ -45,7 +46,7 @@ static void pps_ktimer_event(unsigned long ptr) /* First of all we get the time stamp... */ pps_get_ts(&ts); - pr_info("PPS event at %lu\n", jiffies); + dev_info(pps->dev, "PPS event at %lu\n", jiffies); pps_event(pps, &ts, PPS_CAPTUREASSERT, NULL); @@ -94,7 +95,7 @@ static int __init pps_ktimer_init(void) pps = pps_register_source(&pps_ktimer_info, PPS_CAPTUREASSERT | PPS_OFFSETASSERT); if (pps == NULL) { - printk(KERN_ERR "cannot register ktimer source\n"); + pr_err("cannot register PPS source\n"); return -ENOMEM; } diff --git a/drivers/pps/clients/pps-ldisc.c b/drivers/pps/clients/pps-ldisc.c index 1517f5498ec..1b3c6eda12b 100644 --- a/drivers/pps/clients/pps-ldisc.c +++ b/drivers/pps/clients/pps-ldisc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/module.h> #include <linux/serial_core.h> #include <linux/tty.h> |