From: Corentin Labbe <clabbe.montjoie@gmail.com>
To: clemens@ladisch.de, arnd@arndb.de, gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, Corentin Labbe <clabbe.montjoie@gmail.com>
Subject: [PATCH 4/6] hpet: replace printk by their pr_xxx counterparts
Date: Sat, 25 Mar 2017 15:43:19 +0100 [thread overview]
Message-ID: <20170325144321.14284-5-clabbe.montjoie@gmail.com> (raw)
In-Reply-To: <20170325144321.14284-1-clabbe.montjoie@gmail.com>
This patch replace all printk by their pr_xxx counterparts.
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
---
drivers/char/hpet.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 602b810..e11d6b5 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -490,7 +490,7 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
irq_flags = devp->hd_flags & HPET_SHARED_IRQ ? IRQF_SHARED : 0;
if (request_irq(irq, hpet_interrupt, irq_flags,
devp->hd_name, (void *)devp)) {
- printk(KERN_ERR "hpet: IRQ %d is not free\n", irq);
+ pr_err("hpet: IRQ %d is not free\n", irq);
irq = 0;
}
}
@@ -840,8 +840,7 @@ int hpet_alloc(struct hpet_data *hdp)
* ACPI has also reported, then we catch it here.
*/
if (hpet_is_known(hdp)) {
- printk(KERN_DEBUG "%s: duplicate HPET ignored\n",
- __func__);
+ pr_debug("%s: duplicate HPET ignored\n", __func__);
return 0;
}
@@ -869,8 +868,7 @@ int hpet_alloc(struct hpet_data *hdp)
ntimer = ((cap & HPET_NUM_TIM_CAP_MASK) >> HPET_NUM_TIM_CAP_SHIFT) + 1;
if (hpetp->hp_ntimer != ntimer) {
- printk(KERN_WARNING "hpet: number irqs doesn't agree"
- " with number of timers\n");
+ pr_warn("hpet: number irqs doesn't agree with number of timers\n");
kfree(hpetp);
return -ENODEV;
}
@@ -889,7 +887,7 @@ int hpet_alloc(struct hpet_data *hdp)
do_div(temp, period);
hpetp->hp_tick_freq = temp; /* ticks per second */
- printk(KERN_INFO "hpet%d: at MMIO 0x%lx, IRQ%s",
+ pr_info("hpet%d: at MMIO 0x%lx, IRQ%s",
hpetp->hp_which, hdp->hd_phys_address,
hpetp->hp_ntimer > 1 ? "s" : "");
for (i = 0; i < hpetp->hp_ntimer; i++)
@@ -898,8 +896,7 @@ int hpet_alloc(struct hpet_data *hdp)
temp = hpetp->hp_tick_freq;
remainder = do_div(temp, 1000000);
- printk(KERN_INFO
- "hpet%u: %u comparators, %d-bit %u.%06u MHz counter\n",
+ pr_info("hpet%u: %u comparators, %d-bit %u.%06u MHz counter\n",
hpetp->hp_which, hpetp->hp_ntimer,
cap & HPET_COUNTER_SIZE_MASK ? 64 : 32,
(unsigned)temp, remainder);
@@ -1019,7 +1016,7 @@ static int hpet_acpi_add(struct acpi_device *device)
if (!data.hd_address || !data.hd_nirqs) {
if (data.hd_address)
iounmap(data.hd_address);
- printk("%s: no address or irqs in _CRS\n", __func__);
+ pr_err("%s: no address or irqs in _CRS\n", __func__);
return -ENODEV;
}
--
2.10.2
next prev parent reply other threads:[~2017-03-25 14:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-25 14:43 [PATCH 0/6] hpet: misc fix Corentin Labbe
2017-03-25 14:43 ` [PATCH 1/6] hpet: remove unused variable hpet in hpet_ioctl_common Corentin Labbe
2017-03-25 14:43 ` [PATCH 2/6] hpet: remove unused writeq/readq function definitions Corentin Labbe
2017-03-26 23:49 ` kbuild test robot
2017-03-27 7:43 ` Corentin Labbe
2017-03-27 7:51 ` Clemens Ladisch
2017-03-27 8:53 ` Corentin Labbe
2017-03-25 14:43 ` [PATCH 3/6] hpet: fix checkpatch complains about spaces Corentin Labbe
2017-03-25 14:43 ` Corentin Labbe [this message]
2017-03-25 14:43 ` [PATCH 5/6] hpet: removing unused variable m in hpet_interrupt Corentin Labbe
2017-03-25 14:43 ` [PATCH 6/6] hpet: fix style issue about braces and alignment Corentin Labbe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170325144321.14284-5-clabbe.montjoie@gmail.com \
--to=clabbe.montjoie@gmail.com \
--cc=arnd@arndb.de \
--cc=clemens@ladisch.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®