Skip to content

Commit

Permalink
irqchip/sifive-plic: Use dev_xyz() in-place of pr_xyz()
Browse files Browse the repository at this point in the history
Use dev_info(), dev_warn(), and dev_err() in-place of pr_info(),
pr_warn(), and pr_err().

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240222094006.1030709-3-apatel@ventanamicro.com
  • Loading branch information
Anup Patel authored and Thomas Gleixner committed Feb 23, 2024
1 parent 8ec99b0 commit 25d862e
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions drivers/irqchip/irq-sifive-plic.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Copyright (C) 2017 SiFive
* Copyright (C) 2018 Christoph Hellwig
*/
#define pr_fmt(fmt) "plic: " fmt
#include <linux/cpu.h>
#include <linux/interrupt.h>
#include <linux/io.h>
Expand Down Expand Up @@ -371,9 +370,10 @@ static void plic_handle_irq(struct irq_desc *desc)
while ((hwirq = readl(claim))) {
int err = generic_handle_domain_irq(handler->priv->irqdomain,
hwirq);
if (unlikely(err))
pr_warn_ratelimited("can't find mapping for hwirq %lu\n",
hwirq);
if (unlikely(err)) {
dev_warn_ratelimited(handler->priv->dev,
"can't find mapping for hwirq %lu\n", hwirq);
}
}

chained_irq_exit(chip, desc);
Expand Down Expand Up @@ -401,7 +401,7 @@ static int plic_starting_cpu(unsigned int cpu)
enable_percpu_irq(plic_parent_irq,
irq_get_trigger_type(plic_parent_irq));
else
pr_warn("cpu%d: parent irq not available\n", cpu);
dev_warn(handler->priv->dev, "cpu%d: parent irq not available\n", cpu);
plic_set_threshold(handler, PLIC_ENABLE_THRESHOLD);

return 0;
Expand Down Expand Up @@ -477,7 +477,7 @@ static int plic_probe(struct platform_device *pdev)
unsigned long hartid;

if (of_irq_parse_one(to_of_node(dev->fwnode), i, &parent)) {
pr_err("failed to parse parent for context %d.\n", i);
dev_err(dev, "failed to parse parent for context %d.\n", i);
continue;
}

Expand All @@ -500,13 +500,13 @@ static int plic_probe(struct platform_device *pdev)

error = riscv_of_parent_hartid(parent.np, &hartid);
if (error < 0) {
pr_warn("failed to parse hart ID for context %d.\n", i);
dev_warn(dev, "failed to parse hart ID for context %d.\n", i);
continue;
}

cpu = riscv_hartid_to_cpuid(hartid);
if (cpu < 0) {
pr_warn("Invalid cpuid for context %d\n", i);
dev_warn(dev, "Invalid cpuid for context %d\n", i);
continue;
}

Expand All @@ -525,7 +525,7 @@ static int plic_probe(struct platform_device *pdev)
*/
handler = per_cpu_ptr(&plic_handlers, cpu);
if (handler->present) {
pr_warn("handler already present for context %d.\n", i);
dev_warn(dev, "handler already present for context %d.\n", i);
plic_set_threshold(handler, PLIC_DISABLE_THRESHOLD);
goto done;
}
Expand Down Expand Up @@ -575,8 +575,8 @@ static int plic_probe(struct platform_device *pdev)
}
}

pr_info("%pOFP: mapped %d interrupts with %d handlers for %d contexts.\n",
to_of_node(dev->fwnode), nr_irqs, nr_handlers, nr_contexts);
dev_info(dev, "mapped %d interrupts with %d handlers for %d contexts.\n",
nr_irqs, nr_handlers, nr_contexts);
return 0;

out_free_enable_reg:
Expand Down

0 comments on commit 25d862e

Please sign in to comment.