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

Commit 4ed89f22 authored by Russell King's avatar Russell King
Browse files

ARM: convert printk(KERN_* to pr_* 



Convert many (but not all) printk(KERN_* to pr_* to simplify the code.
We take the opportunity to join some printk lines together so we don't
split the message across several lines, and we also add a few levels
to some messages which were previously missing them.

Tested-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c2459d35

arch/arm/common/sa1111.c

+6 −7
Original line number Diff line number Diff line
@@ -282,8 +282,8 @@ static int sa1111_retrigger_lowirq(struct irq_data *d) 
	}



	if (i == 8)

		printk(KERN_ERR "Danger Will Robinson: failed to "

			"re-trigger IRQ%d\n", d->irq);

		pr_err("Danger Will Robinson: failed to re-trigger IRQ%d\n",

		       d->irq);

	return i == 8 ? -1 : 0;

}
@@ -384,8 +384,8 @@ static int sa1111_retrigger_highirq(struct irq_data *d) 
	}



	if (i == 8)

		printk(KERN_ERR "Danger Will Robinson: failed to "

			"re-trigger IRQ%d\n", d->irq);

		pr_err("Danger Will Robinson: failed to re-trigger IRQ%d\n",

		       d->irq);

	return i == 8 ? -1 : 0;

}
@@ -740,9 +740,8 @@ static int __sa1111_probe(struct device *me, struct resource *mem, int irq) 
		goto err_unmap;

	}



	printk(KERN_INFO "SA1111 Microprocessor Companion Chip: "

		"silicon revision %lx, metal revision %lx\n",

		(id & SKID_SIREV_MASK)>>4, (id & SKID_MTREV_MASK));

	pr_info("SA1111 Microprocessor Companion Chip: silicon revision %lx, metal revision %lx\n",

		(id & SKID_SIREV_MASK) >> 4, id & SKID_MTREV_MASK);



	/*

	 * We found it.  Wake the chip up, and initialise.

arch/arm/kernel/atags_compat.c

+2 −4
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ static void __init build_tag_list(struct param_struct *params, void *taglist) 
	struct tag *tag = taglist;



	if (params->u1.s.page_size != PAGE_SIZE) {

		printk(KERN_WARNING "Warning: bad configuration page, "

		       "trying to continue\n");

		pr_warn("Warning: bad configuration page, trying to continue\n");

		return;

	}
@@ -109,8 +108,7 @@ static void __init build_tag_list(struct param_struct *params, void *taglist) 
	    params->u1.s.nr_pages != 0x04000 &&

	    params->u1.s.nr_pages != 0x08000 &&

	    params->u1.s.nr_pages != 0x10000) {

		printk(KERN_WARNING "Warning: bad NeTTrom parameters "

		       "detected, using defaults\n");

		pr_warn("Warning: bad NeTTrom parameters detected, using defaults\n");



		params->u1.s.nr_pages = 0x1000;	/* 16MB */

		params->u1.s.ramdisk_size = 0;

arch/arm/kernel/atags_parse.c

+2 −3
Original line number Diff line number Diff line
@@ -167,8 +167,7 @@ static void __init parse_tags(const struct tag *t) 
{

	for (; t->hdr.size; t = tag_next(t))

		if (!parse_tag(t))

			printk(KERN_WARNING

				"Ignoring unrecognised tag 0x%08x\n",

			pr_warn("Ignoring unrecognised tag 0x%08x\n",

				t->hdr.tag);

}
@@ -193,7 +192,7 @@ setup_machine_tags(phys_addr_t __atags_pointer, unsigned int machine_nr) 
	 */

	for_each_machine_desc(p)

		if (machine_nr == p->nr) {

			printk("Machine: %s\n", p->name);

			pr_info("Machine: %s\n", p->name);

			mdesc = p;

			break;

		}

arch/arm/kernel/atags_proc.c

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static int __init init_atags_procfs(void) 
	size_t size;



	if (tag->hdr.tag != ATAG_CORE) {

		printk(KERN_INFO "No ATAGs?");

		pr_info("No ATAGs?");

		return -EINVAL;

	}
@@ -68,7 +68,7 @@ static int __init init_atags_procfs(void) 


nomem:

	kfree(b);

	printk(KERN_ERR "Exporting ATAGs: not enough memory\n");

	pr_err("Exporting ATAGs: not enough memory\n");



	return -ENOMEM;

}

arch/arm/kernel/bios32.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ void pcibios_fixup_bus(struct pci_bus *bus) 
	/*

	 * Report what we did for this bus

	 */

	printk(KERN_INFO "PCI: bus%d: Fast back to back transfers %sabled\n",

	pr_info("PCI: bus%d: Fast back to back transfers %sabled\n",

		bus->number, (features & PCI_COMMAND_FAST_BACK) ? "en" : "dis");

}

EXPORT_SYMBOL(pcibios_fixup_bus);