Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753036AbdDCMTC (ORCPT ); Mon, 3 Apr 2017 08:19:02 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:35358 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752874AbdDCMSN (ORCPT ); Mon, 3 Apr 2017 08:18:13 -0400 From: Corentin Labbe To: clemens@ladisch.de, arnd@arndb.de, gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH v2 4/6] hpet: replace printk by their pr_xxx counterparts Date: Mon, 3 Apr 2017 14:15:57 +0200 Message-Id: <20170403121559.1397-5-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170403121559.1397-1-clabbe.montjoie@gmail.com> References: <20170403121559.1397-1-clabbe.montjoie@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2421 Lines: 70 This patch replace all printk by their pr_xxx counterparts. Signed-off-by: Corentin Labbe --- 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 7a35739..59e89e5 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -491,7 +491,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; } } @@ -841,8 +841,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; } @@ -870,8 +869,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; } @@ -890,7 +888,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++) @@ -899,8 +897,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); @@ -1020,7 +1017,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