renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 09:13:55 +08:00
Code

nios2: use of_property_read_bool

Browse Source 
Use of_property_read_bool instead of open-coding it as fpcu_has.
Convert the members of struct cpuinfo from u32 to bool accordingly as
they are only used as boolean anyhow.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

Acked-by: Ley Foon Tan <lftan@altera.com>
This commit is contained in:
Ley Foon Tan 2016-08-25 16:11:59 +08:00
parent c8d2bc9bc3
commit 476080a793
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/nios2/include/asm/cpuinfo.h
View File

@ -25,10 +25,10 @@ struct cpuinfo {
/* Core CPU configuration */ /* Core CPU configuration */
char cpu_impl[12]; char cpu_impl[12];
u32 cpu_clock_freq; u32 cpu_clock_freq;
u32 mmu; bool mmu;
u32 has_div; bool has_div;
u32 has_mul; bool has_mul;
u32 has_mulx; bool has_mulx;
/* CPU caches */ /* CPU caches */
u32 icache_line_size; u32 icache_line_size;

15
arch/nios2/kernel/cpuinfo.c
View File

@ -41,11 +41,6 @@ static inline u32 fcpu(struct device_node *cpu, const char *n)
return val; return val;
} }
static inline u32 fcpu_has(struct device_node *cpu, const char *n)
{
return of_get_property(cpu, n, NULL) ? 1 : 0;
}
void __init setup_cpuinfo(void) void __init setup_cpuinfo(void)
{ {
struct device_node *cpu; struct device_node *cpu;
@ -56,7 +51,7 @@ void __init setup_cpuinfo(void)
if (!cpu) if (!cpu)
panic("%s: No CPU found in devicetree!\n", __func__); panic("%s: No CPU found in devicetree!\n", __func__);
if (!fcpu_has(cpu, "altr,has-initda")) if (!of_property_read_bool(cpu, "altr,has-initda"))
panic("initda instruction is unimplemented. Please update your " panic("initda instruction is unimplemented. Please update your "
"hardware system to have more than 4-byte line data " "hardware system to have more than 4-byte line data "
"cache\n"); "cache\n");
@ -69,10 +64,10 @@ void __init setup_cpuinfo(void)
else else
strcpy(cpuinfo.cpu_impl, "<unknown>"); strcpy(cpuinfo.cpu_impl, "<unknown>");
cpuinfo.has_div = fcpu_has(cpu, "altr,has-div"); cpuinfo.has_div = of_property_read_bool(cpu, "altr,has-div");
cpuinfo.has_mul = fcpu_has(cpu, "altr,has-mul"); cpuinfo.has_mul = of_property_read_bool(cpu, "altr,has-mul");
cpuinfo.has_mulx = fcpu_has(cpu, "altr,has-mulx"); cpuinfo.has_mulx = of_property_read_bool(cpu, "altr,has-mulx");
cpuinfo.mmu = fcpu_has(cpu, "altr,has-mmu"); cpuinfo.mmu = of_property_read_bool(cpu, "altr,has-mmu");
if (IS_ENABLED(CONFIG_NIOS2_HW_DIV_SUPPORT) && !cpuinfo.has_div) if (IS_ENABLED(CONFIG_NIOS2_HW_DIV_SUPPORT) && !cpuinfo.has_div)
err_cpu("DIV"); err_cpu("DIV");