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

Commit 52a5566e authored by Will Deacon's avatar Will Deacon
Browse files

ARM: perf: use pr_* instead of printk 



There are a few remaining uses of printk in the ARM perf code, so move
them over to the pr_* variants instead.

Reported-by: default avatarRussell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent cb6eb108

arch/arm/kernel/perf_event_cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static int cpu_pmu_request_irq(struct arm_pmu *cpu_pmu, irq_handler_t handler) 


	irqs = min(pmu_device->num_resources, num_possible_cpus());

	if (irqs < 1) {

		printk_once("perf/ARM: No irqs for PMU defined, sampling events not supported\n");

		pr_warn_once("perf/ARM: No irqs for PMU defined, sampling events not supported\n");

		return 0;

	}

arch/arm/kernel/perf_event_v7.c

+9 −9
Original line number Diff line number Diff line
@@ -663,34 +663,34 @@ static void armv7_pmnc_dump_regs(struct arm_pmu *cpu_pmu) 
	u32 val;

	unsigned int cnt;



	printk(KERN_INFO "PMNC registers dump:\n");

	pr_info("PMNC registers dump:\n");



	asm volatile("mrc p15, 0, %0, c9, c12, 0" : "=r" (val));

	printk(KERN_INFO "PMNC  =0x%08x\n", val);

	pr_info("PMNC  =0x%08x\n", val);



	asm volatile("mrc p15, 0, %0, c9, c12, 1" : "=r" (val));

	printk(KERN_INFO "CNTENS=0x%08x\n", val);

	pr_info("CNTENS=0x%08x\n", val);



	asm volatile("mrc p15, 0, %0, c9, c14, 1" : "=r" (val));

	printk(KERN_INFO "INTENS=0x%08x\n", val);

	pr_info("INTENS=0x%08x\n", val);



	asm volatile("mrc p15, 0, %0, c9, c12, 3" : "=r" (val));

	printk(KERN_INFO "FLAGS =0x%08x\n", val);

	pr_info("FLAGS =0x%08x\n", val);



	asm volatile("mrc p15, 0, %0, c9, c12, 5" : "=r" (val));

	printk(KERN_INFO "SELECT=0x%08x\n", val);

	pr_info("SELECT=0x%08x\n", val);



	asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r" (val));

	printk(KERN_INFO "CCNT  =0x%08x\n", val);

	pr_info("CCNT  =0x%08x\n", val);



	for (cnt = ARMV7_IDX_COUNTER0;

			cnt <= ARMV7_IDX_COUNTER_LAST(cpu_pmu); cnt++) {

		armv7_pmnc_select_counter(cnt);

		asm volatile("mrc p15, 0, %0, c9, c13, 2" : "=r" (val));

		printk(KERN_INFO "CNT[%d] count =0x%08x\n",

		pr_info("CNT[%d] count =0x%08x\n",

			ARMV7_IDX_TO_COUNTER(cnt), val);

		asm volatile("mrc p15, 0, %0, c9, c13, 1" : "=r" (val));

		printk(KERN_INFO "CNT[%d] evtsel=0x%08x\n",

		pr_info("CNT[%d] evtsel=0x%08x\n",

			ARMV7_IDX_TO_COUNTER(cnt), val);

	}

}