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

Commit 6ff0bc94 authored by Alex Chiang's avatar Alex Chiang Committed by Tony Luck
Browse files

[IA64] Remove printk noise on unimplemented SAL_PHYSICAL_ID_INFO 



Commit 113134fc changed the flow of
control when calling PAL_LOGICAL_TO_PHYSICAL and SAL_PHYSICAL_ID_INFO.
With the change, if a platform did not implement the latter, a useless
printk would appear in the boot log:

	ia64_sal_pltid failed with -1

So let's check the return code and only printk on a true error, and do
not print anything in the unimplemented case. While we're in there,
clean up some stylistic issues too.

Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent e4a064df

arch/ia64/kernel/smpboot.c

+9 −3
Original line number Diff line number Diff line
@@ -873,7 +873,8 @@ identify_siblings(struct cpuinfo_ia64 *c) 
	u16 pltid;

	pal_logical_to_physical_t info;



	if ((status = ia64_pal_logical_to_phys(-1, &info)) != PAL_STATUS_SUCCESS) {

	status = ia64_pal_logical_to_phys(-1, &info);

	if (status != PAL_STATUS_SUCCESS) {

		if (status != PAL_STATUS_UNIMPLEMENTED) {

			printk(KERN_ERR

				"ia64_pal_logical_to_phys failed with %ld\n",
@@ -885,8 +886,13 @@ identify_siblings(struct cpuinfo_ia64 *c) 
		info.overview_cpp  = 1;

		info.overview_tpc  = 1;

	}

	if ((status = ia64_sal_physical_id_info(&pltid)) != PAL_STATUS_SUCCESS) {

		printk(KERN_ERR "ia64_sal_pltid failed with %ld\n", status);



	status = ia64_sal_physical_id_info(&pltid);

	if (status != PAL_STATUS_SUCCESS) {

		if (status != PAL_STATUS_UNIMPLEMENTED)

			printk(KERN_ERR

				"ia64_sal_pltid failed with %ld\n",

				status);

		return;

	}