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

Commit e13606d7 authored by Darren Stevens's avatar Darren Stevens Committed by Michael Ellerman
Browse files

powerpc/pasemi: Use pr_err/pr_warn... for kernel messages 



Pasemi code still uses printk(KERN_ERR/KERN_WARN ... change these to
pr_err(, pr_warn(... to match other powerpc arch code.

No functional changes.

Signed-off-by: default avatarDarren Stevens <darren@stevens-zone.net>
[mpe: Unsplit some strings while we're at it]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent a99b9c5e

arch/powerpc/platforms/pasemi/dma_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ int pasemi_dma_init(void) 
	iob_pdev = pci_get_device(PCI_VENDOR_ID_PASEMI, 0xa001, NULL);

	if (!iob_pdev) {

		BUG();

		printk(KERN_WARNING "Can't find I/O Bridge\n");

		pr_warn("Can't find I/O Bridge\n");

		err = -ENODEV;

		goto out;

	}
@@ -540,7 +540,7 @@ int pasemi_dma_init(void) 
	dma_pdev = pci_get_device(PCI_VENDOR_ID_PASEMI, 0xa007, NULL);

	if (!dma_pdev) {

		BUG();

		printk(KERN_WARNING "Can't find DMA controller\n");

		pr_warn("Can't find DMA controller\n");

		err = -ENODEV;

		goto out;

	}
@@ -623,7 +623,7 @@ int pasemi_dma_init(void) 
	pasemi_write_dma_reg(PAS_DMA_TXF_CFLG0, 0xffffffff);

	pasemi_write_dma_reg(PAS_DMA_TXF_CFLG1, 0xffffffff);



	printk(KERN_INFO "PA Semi PWRficient DMA library initialized "

	pr_info("PA Semi PWRficient DMA library initialized "

		"(%d tx, %d rx channels)\n", num_txch, num_rxch);



out:

arch/powerpc/platforms/pasemi/gpio_mdio.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static int gpio_mdio_probe(struct platform_device *ofdev) 
	err = of_mdiobus_register(new_bus, np);



	if (err != 0) {

		printk(KERN_ERR "%s: Cannot register as MDIO bus, err %d\n",

		pr_err("%s: Cannot register as MDIO bus, err %d\n",

				new_bus->name, err);

		goto out_free_irq;

	}

arch/powerpc/platforms/pasemi/idle.c

+2 −2
Original line number Diff line number Diff line
@@ -78,13 +78,13 @@ static int pasemi_system_reset_exception(struct pt_regs *regs) 
static int __init pasemi_idle_init(void)

{

#ifndef CONFIG_PPC_PASEMI_CPUFREQ

	printk(KERN_WARNING "No cpufreq driver, powersavings modes disabled\n");

	pr_warn("No cpufreq driver, powersavings modes disabled\n");

	current_mode = 0;

#endif



	ppc_md.system_reset_exception = pasemi_system_reset_exception;

	ppc_md.power_save = modes[current_mode].entry;

	printk(KERN_INFO "Using PA6T idle loop (%s)\n", modes[current_mode].name);

	pr_info("Using PA6T idle loop (%s)\n", modes[current_mode].name);



	return 0;

}

arch/powerpc/platforms/pasemi/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int __init iob_init(struct device_node *dn) 
	/* For 2G space, 8x64 pages (2^21 bytes) is max total l2 size */

	iob_l2_base = (u32 *)__va(memblock_alloc_base(1UL<<21, 1UL<<21, 0x80000000));



	printk(KERN_INFO "IOBMAP L2 allocated at: %p\n", iob_l2_base);

	pr_info("IOBMAP L2 allocated at: %p\n", iob_l2_base);



	/* Allocate a spare page to map all invalid IOTLB pages. */

	tmp = memblock_alloc(IOBMAP_PAGE_SIZE, IOBMAP_PAGE_SIZE);

arch/powerpc/platforms/pasemi/misc.c

+1 −3
Original line number Diff line number Diff line
@@ -69,9 +69,7 @@ static int __init pasemi_register_i2c_devices(void) 
			addr = of_get_property(node, "reg", &len);

			if (!addr || len < sizeof(int) ||

			    *addr > (1 << 10) - 1) {

				printk(KERN_WARNING

					"pasemi_register_i2c_devices: "

					"invalid i2c device entry\n");

				pr_warn("pasemi_register_i2c_devices: invalid i2c device entry\n");

				continue;

			}