33 * Copyright (C) 2017 SiFive
44 * Copyright (C) 2018 Christoph Hellwig
55 */
6- #define pr_fmt (fmt ) "plic: " fmt
76#include <linux/cpu.h>
87#include <linux/interrupt.h>
98#include <linux/io.h>
@@ -371,9 +370,10 @@ static void plic_handle_irq(struct irq_desc *desc)
371370 while ((hwirq = readl (claim ))) {
372371 int err = generic_handle_domain_irq (handler -> priv -> irqdomain ,
373372 hwirq );
374- if (unlikely (err ))
375- pr_warn_ratelimited ("can't find mapping for hwirq %lu\n" ,
376- hwirq );
373+ if (unlikely (err )) {
374+ dev_warn_ratelimited (handler -> priv -> dev ,
375+ "can't find mapping for hwirq %lu\n" , hwirq );
376+ }
377377 }
378378
379379 chained_irq_exit (chip , desc );
@@ -401,7 +401,7 @@ static int plic_starting_cpu(unsigned int cpu)
401401 enable_percpu_irq (plic_parent_irq ,
402402 irq_get_trigger_type (plic_parent_irq ));
403403 else
404- pr_warn ( "cpu%d: parent irq not available\n" , cpu );
404+ dev_warn ( handler -> priv -> dev , "cpu%d: parent irq not available\n" , cpu );
405405 plic_set_threshold (handler , PLIC_ENABLE_THRESHOLD );
406406
407407 return 0 ;
@@ -477,7 +477,7 @@ static int plic_probe(struct platform_device *pdev)
477477 unsigned long hartid ;
478478
479479 if (of_irq_parse_one (to_of_node (dev -> fwnode ), i , & parent )) {
480- pr_err ( "failed to parse parent for context %d.\n" , i );
480+ dev_err ( dev , "failed to parse parent for context %d.\n" , i );
481481 continue ;
482482 }
483483
@@ -500,13 +500,13 @@ static int plic_probe(struct platform_device *pdev)
500500
501501 error = riscv_of_parent_hartid (parent .np , & hartid );
502502 if (error < 0 ) {
503- pr_warn ( "failed to parse hart ID for context %d.\n" , i );
503+ dev_warn ( dev , "failed to parse hart ID for context %d.\n" , i );
504504 continue ;
505505 }
506506
507507 cpu = riscv_hartid_to_cpuid (hartid );
508508 if (cpu < 0 ) {
509- pr_warn ( "Invalid cpuid for context %d\n" , i );
509+ dev_warn ( dev , "Invalid cpuid for context %d\n" , i );
510510 continue ;
511511 }
512512
@@ -525,7 +525,7 @@ static int plic_probe(struct platform_device *pdev)
525525 */
526526 handler = per_cpu_ptr (& plic_handlers , cpu );
527527 if (handler -> present ) {
528- pr_warn ( "handler already present for context %d.\n" , i );
528+ dev_warn ( dev , "handler already present for context %d.\n" , i );
529529 plic_set_threshold (handler , PLIC_DISABLE_THRESHOLD );
530530 goto done ;
531531 }
@@ -575,8 +575,8 @@ static int plic_probe(struct platform_device *pdev)
575575 }
576576 }
577577
578- pr_info ( "%pOFP: mapped %d interrupts with %d handlers for %d contexts.\n" ,
579- to_of_node ( dev -> fwnode ), nr_irqs , nr_handlers , nr_contexts );
578+ dev_info ( dev , " mapped %d interrupts with %d handlers for %d contexts.\n" ,
579+ nr_irqs , nr_handlers , nr_contexts );
580580 return 0 ;
581581
582582out_free_enable_reg :
0 commit comments