diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2015-01-27 23:10:33 -0500 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-01-27 23:10:33 -0500 |
commit | 08135139430fabdeaa990da8a9e0d436aad0672b (patch) | |
tree | c03147d6447da02cc646cfbb11adbd0522cb5c26 | |
parent | 8aa989b8fba1428b50a1be771c01285f1de0227b (diff) |
powerpc/powernv: Remove "opal" prefix from pr_xxx()s
In commit c8742f85125d "powerpc/powernv: Expose OPAL firmware symbol
map" I added pr_fmt() to opal.c. This left some existing pr_xxx()s with
duplicate "opal" prefixes, eg:
opal: opal: Found 0 interrupts reserved for OPAL
Fix them all up. Also make the "Not not found" message a bit more
verbose.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r-- | arch/powerpc/platforms/powernv/opal.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c index 1db119f0f4ee..8f5bbfae9c32 100644 --- a/arch/powerpc/platforms/powernv/opal.c +++ b/arch/powerpc/platforms/powernv/opal.c | |||
@@ -208,7 +208,7 @@ static int __init opal_register_exception_handlers(void) | |||
208 | * start catching/handling HMI directly in Linux. | 208 | * start catching/handling HMI directly in Linux. |
209 | */ | 209 | */ |
210 | if (!opal_check_token(OPAL_HANDLE_HMI)) { | 210 | if (!opal_check_token(OPAL_HANDLE_HMI)) { |
211 | pr_info("opal: Old firmware detected, OPAL handles HMIs.\n"); | 211 | pr_info("Old firmware detected, OPAL handles HMIs.\n"); |
212 | opal_register_exception_handler( | 212 | opal_register_exception_handler( |
213 | OPAL_HYPERVISOR_MAINTENANCE_HANDLER, | 213 | OPAL_HYPERVISOR_MAINTENANCE_HANDLER, |
214 | 0, glue); | 214 | 0, glue); |
@@ -709,7 +709,7 @@ static int __init opal_init(void) | |||
709 | 709 | ||
710 | opal_node = of_find_node_by_path("/ibm,opal"); | 710 | opal_node = of_find_node_by_path("/ibm,opal"); |
711 | if (!opal_node) { | 711 | if (!opal_node) { |
712 | pr_warn("opal: Node not found\n"); | 712 | pr_warn("Device node not found\n"); |
713 | return -ENODEV; | 713 | return -ENODEV; |
714 | } | 714 | } |
715 | 715 | ||
@@ -732,7 +732,7 @@ static int __init opal_init(void) | |||
732 | 732 | ||
733 | /* Find all OPAL interrupts and request them */ | 733 | /* Find all OPAL interrupts and request them */ |
734 | irqs = of_get_property(opal_node, "opal-interrupts", &irqlen); | 734 | irqs = of_get_property(opal_node, "opal-interrupts", &irqlen); |
735 | pr_debug("opal: Found %d interrupts reserved for OPAL\n", | 735 | pr_debug("Found %d interrupts reserved for OPAL\n", |
736 | irqs ? (irqlen / 4) : 0); | 736 | irqs ? (irqlen / 4) : 0); |
737 | opal_irq_count = irqlen / 4; | 737 | opal_irq_count = irqlen / 4; |
738 | opal_irqs = kzalloc(opal_irq_count * sizeof(unsigned int), GFP_KERNEL); | 738 | opal_irqs = kzalloc(opal_irq_count * sizeof(unsigned int), GFP_KERNEL); |
@@ -740,13 +740,13 @@ static int __init opal_init(void) | |||
740 | unsigned int hwirq = be32_to_cpup(irqs); | 740 | unsigned int hwirq = be32_to_cpup(irqs); |
741 | unsigned int irq = irq_create_mapping(NULL, hwirq); | 741 | unsigned int irq = irq_create_mapping(NULL, hwirq); |
742 | if (irq == NO_IRQ) { | 742 | if (irq == NO_IRQ) { |
743 | pr_warning("opal: Failed to map irq 0x%x\n", hwirq); | 743 | pr_warning("Failed to map irq 0x%x\n", hwirq); |
744 | continue; | 744 | continue; |
745 | } | 745 | } |
746 | rc = request_irq(irq, opal_interrupt, 0, "opal", NULL); | 746 | rc = request_irq(irq, opal_interrupt, 0, "opal", NULL); |
747 | if (rc) | 747 | if (rc) |
748 | pr_warning("opal: Error %d requesting irq %d" | 748 | pr_warning("Error %d requesting irq %d (0x%x)\n", |
749 | " (0x%x)\n", rc, irq, hwirq); | 749 | rc, irq, hwirq); |
750 | opal_irqs[i] = irq; | 750 | opal_irqs[i] = irq; |
751 | } | 751 | } |
752 | 752 | ||