Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2c2cbcc authored by Joe Perches's avatar Joe Perches Committed by Michael Ellerman
Browse files

powerpc: Use pr_warn instead of pr_warning 



At some point, pr_warning will be removed so all logging messages use
a consistent <prefix>_warn style.

Update arch/powerpc/

Miscellanea:

o Coalesce formats
o Realign arguments
o Use %s, __func__ instead of embedded function names
o Remove unnecessary line continuations

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarGeoff Levand <geoff@infradead.org>
[mpe: Rebase due to some %pOF changes.]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent ae64f9bd

arch/powerpc/kernel/pci-common.c

+2 −2
Original line number Diff line number Diff line
@@ -1276,8 +1276,8 @@ static void pcibios_allocate_bus_resources(struct pci_bus *bus) 
						i + PCI_BRIDGE_RESOURCES) == 0)

				continue;

		}

		pr_warning("PCI: Cannot allocate resource region "

			   "%d of PCI bridge %d, will remap\n", i, bus->number);

		pr_warn("PCI: Cannot allocate resource region %d of PCI bridge %d, will remap\n",

			i, bus->number);

	clear_resource:

		/* The resource might be figured out when doing

		 * reassignment based on the resources required

arch/powerpc/mm/init_64.c

+2 −3
Original line number Diff line number Diff line
@@ -214,9 +214,8 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node) 


		rc = vmemmap_create_mapping(start, page_size, __pa(p));

		if (rc < 0) {

			pr_warning(

				"vmemmap_populate: Unable to create vmemmap mapping: %d\n",

				rc);

			pr_warn("%s: Unable to create vmemmap mapping: %d\n",

				__func__, rc);

			return -EFAULT;

		}

	}

arch/powerpc/mm/mem.c

+1 −2
Original line number Diff line number Diff line
@@ -138,8 +138,7 @@ int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock) 
	start = (unsigned long)__va(start);

	rc = create_section_mapping(start, start + size);

	if (rc) {

		pr_warning(

			"Unable to create mapping for hot added memory 0x%llx..0x%llx: %d\n",

		pr_warn("Unable to create mapping for hot added memory 0x%llx..0x%llx: %d\n",

			start, start + size, rc);

		return -EFAULT;

	}

arch/powerpc/platforms/512x/mpc512x_shared.c

+2 −2
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static unsigned int __init get_fifo_size(struct device_node *np, 
	if (fp)

		return *fp;



	pr_warning("no %s property in %pOF node, defaulting to %d\n",

	pr_warn("no %s property in %pOF node, defaulting to %d\n",

		prop_name, np, DEFAULT_FIFO_SIZE);



	return DEFAULT_FIFO_SIZE;

arch/powerpc/platforms/85xx/socrates_fpga_pic.c

+3 −4
Original line number Diff line number Diff line
@@ -252,8 +252,7 @@ static int socrates_fpga_pic_host_xlate(struct irq_domain *h, 
		/* type is configurable */

		if (intspec[1] != IRQ_TYPE_LEVEL_LOW &&

		    intspec[1] != IRQ_TYPE_LEVEL_HIGH) {

			pr_warning("FPGA PIC: invalid irq type, "

				   "setting default active low\n");

			pr_warn("FPGA PIC: invalid irq type, setting default active low\n");

			*out_flags = IRQ_TYPE_LEVEL_LOW;

		} else {

			*out_flags = intspec[1];
@@ -267,7 +266,7 @@ static int socrates_fpga_pic_host_xlate(struct irq_domain *h, 
	if (intspec[2] <= 2)

		fpga_irq->irq_line = intspec[2];

	else

		pr_warning("FPGA PIC: invalid irq routing\n");

		pr_warn("FPGA PIC: invalid irq routing\n");



	return 0;

}
@@ -293,7 +292,7 @@ void socrates_fpga_pic_init(struct device_node *pic) 
	for (i = 0; i < 3; i++) {

		socrates_fpga_irqs[i] = irq_of_parse_and_map(pic, i);

		if (!socrates_fpga_irqs[i]) {

			pr_warning("FPGA PIC: can't get irq%d.\n", i);

			pr_warn("FPGA PIC: can't get irq%d\n", i);

			continue;

		}

		irq_set_chained_handler(socrates_fpga_irqs[i],