diff options
author | Alex Chiang <achiang@hp.com> | 2008-04-24 14:57:08 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-04-29 16:51:28 -0400 |
commit | 6ff0bc94eee96fe45e5caa338c8b03cb99431fa9 (patch) | |
tree | b8c3876d9d9fe5b7896e1010bd038104a9fc630c | |
parent | e4a064dfa2b242519a9f06f9a1e58c27bf0c371b (diff) |
[IA64] Remove printk noise on unimplemented SAL_PHYSICAL_ID_INFO
Commit 113134fcbca83619be4c68d0ca66db6093777b5d 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: Alex Chiang <achiang@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r-- | arch/ia64/kernel/smpboot.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 16483be18c0b..d7ad42b77d41 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
@@ -873,7 +873,8 @@ identify_siblings(struct cpuinfo_ia64 *c) | |||
873 | u16 pltid; | 873 | u16 pltid; |
874 | pal_logical_to_physical_t info; | 874 | pal_logical_to_physical_t info; |
875 | 875 | ||
876 | if ((status = ia64_pal_logical_to_phys(-1, &info)) != PAL_STATUS_SUCCESS) { | 876 | status = ia64_pal_logical_to_phys(-1, &info); |
877 | if (status != PAL_STATUS_SUCCESS) { | ||
877 | if (status != PAL_STATUS_UNIMPLEMENTED) { | 878 | if (status != PAL_STATUS_UNIMPLEMENTED) { |
878 | printk(KERN_ERR | 879 | printk(KERN_ERR |
879 | "ia64_pal_logical_to_phys failed with %ld\n", | 880 | "ia64_pal_logical_to_phys failed with %ld\n", |
@@ -885,8 +886,13 @@ identify_siblings(struct cpuinfo_ia64 *c) | |||
885 | info.overview_cpp = 1; | 886 | info.overview_cpp = 1; |
886 | info.overview_tpc = 1; | 887 | info.overview_tpc = 1; |
887 | } | 888 | } |
888 | if ((status = ia64_sal_physical_id_info(&pltid)) != PAL_STATUS_SUCCESS) { | 889 | |
889 | printk(KERN_ERR "ia64_sal_pltid failed with %ld\n", status); | 890 | status = ia64_sal_physical_id_info(&pltid); |
891 | if (status != PAL_STATUS_SUCCESS) { | ||
892 | if (status != PAL_STATUS_UNIMPLEMENTED) | ||
893 | printk(KERN_ERR | ||
894 | "ia64_sal_pltid failed with %ld\n", | ||
895 | status); | ||
890 | return; | 896 | return; |
891 | } | 897 | } |
892 | 898 | ||