Commit 85566ca6 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP3: Fix formatting of features printed 



With the printk cleanups merged into v4.9-rc1, we now get the omap
revision printed on multiple lines. Let's fix that and also remove the
extra empty space at the end of the features. And let's update things
to use scnprintf as suggested by Ivaylo Dimitrov
<ivo.g.dimitrov.75@gmail.com>.

Reported-by: default avatarAdam Ford <aford173@gmail.com>
Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Reviewed-by: default avatarSebastian Reichel <sre@kernel.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 1001354c

arch/arm/mach-omap2/id.c

+11 −5
Original line number Diff line number Diff line
@@ -205,11 +205,15 @@ void __init omap2xxx_check_revision(void) 


#define OMAP3_SHOW_FEATURE(feat)		\

	if (omap3_has_ ##feat())		\

		printk(#feat" ");

		n += scnprintf(buf + n, sizeof(buf) - n, #feat " ");



static void __init omap3_cpuinfo(void)

{

	const char *cpu_name;

	char buf[64];

	int n = 0;



	memset(buf, 0, sizeof(buf));



	/*

	 * OMAP3430 and OMAP3530 are assumed to be same.
@@ -241,10 +245,10 @@ static void __init omap3_cpuinfo(void) 
		cpu_name = "OMAP3503";

	}



	sprintf(soc_name, "%s", cpu_name);

	scnprintf(soc_name, sizeof(soc_name), "%s", cpu_name);



	/* Print verbose information */

	pr_info("%s %s (", soc_name, soc_rev);

	n += scnprintf(buf, sizeof(buf) - n, "%s %s (", soc_name, soc_rev);



	OMAP3_SHOW_FEATURE(l2cache);

	OMAP3_SHOW_FEATURE(iva);
@@ -252,8 +256,10 @@ static void __init omap3_cpuinfo(void) 
	OMAP3_SHOW_FEATURE(neon);

	OMAP3_SHOW_FEATURE(isp);

	OMAP3_SHOW_FEATURE(192mhz_clk);



	printk(")\n");

	if (*(buf + n - 1) == ' ')

		n--;

	n += scnprintf(buf + n, sizeof(buf) - n, ")\n");

	pr_info("%s", buf);

}



#define OMAP3_CHECK_FEATURE(status,feat)				\

CRA Git | Maintained and supported by SUSTech CRA and CCSE