RISC-V: Rename riscv_of_processor_hart to riscv_of_processor_hartid

palmer-dabbelt · palmer-dabbelt · commit b2f8cfa7ac34 · 2018-10-22T17:03:36.000-07:00
It's a bit confusing exactly what this function does: it actually
returns the hartid of an OF processor node, failing with -1 on invalid
nodes.  I've changed the name to _hartid() in order to make that a bit
more clear, as well as adding a comment.

Signed-off-by: Palmer Dabbelt &lt;palmer@sifive.com&gt;
[Atish: code comment formatting update]
Signed-off-by: Atish Patra &lt;atish.patra@wdc.com&gt;
Reviewed-by: Christoph Hellwig &lt;hch@lst.de&gt;
Signed-off-by: Palmer Dabbelt &lt;palmer@sifive.com&gt;
diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h
@@ -88,7 +88,7 @@ static inline void wait_for_interrupt(void)
 }
 
 struct device_node;
-extern int riscv_of_processor_hart(struct device_node *node);
+int riscv_of_processor_hartid(struct device_node *node);
 
 extern void riscv_fill_hwcap(void);
 
diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c
@@ -15,8 +15,11 @@
 #include <linux/seq_file.h>
 #include <linux/of.h>
 
-/* Return -1 if not a valid hart */
-int riscv_of_processor_hart(struct device_node *node)
+/*
+ * Returns the hart ID of the given device tree node, or -1 if the device tree
+ * node isn't a RISC-V hart.
+ */
+int riscv_of_processor_hartid(struct device_node *node)
 {
 	const char *isa, *status;
 	u32 hart;
diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c
@@ -53,7 +53,7 @@ void __init setup_smp(void)
 	int hart, im_okay_therefore_i_am = 0;
 
 	while ((dn = of_find_node_by_type(dn, "cpu"))) {
-		hart = riscv_of_processor_hart(dn);
+		hart = riscv_of_processor_hartid(dn);
 		if (hart >= 0) {
 			set_cpu_possible(hart, true);
 			set_cpu_present(hart, true);
diff --git a/drivers/clocksource/riscv_timer.c b/drivers/clocksource/riscv_timer.c
@@ -84,7 +84,7 @@ void riscv_timer_interrupt(void)
 
 static int __init riscv_timer_init_dt(struct device_node *n)
 {
-	int cpu_id = riscv_of_processor_hart(n), error;
+	int cpu_id = riscv_of_processor_hartid(n), error;
 	struct clocksource *cs;
 
 	if (cpu_id != smp_processor_id())
diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
@@ -176,7 +176,7 @@ static int plic_find_hart_id(struct device_node *node)
 {
 	for (; node; node = node->parent) {
 		if (of_device_is_compatible(node, "riscv"))
-			return riscv_of_processor_hart(node);
+			return riscv_of_processor_hartid(node);
 	}
 
 	return -1;

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ static inline void wait_for_interrupt(void)`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`struct device_node;`
`91`		`-extern int riscv_of_processor_hart(struct device_node *node);`
	`91`	`+int riscv_of_processor_hartid(struct device_node *node);`
`92`	`92`
`93`	`93`	`extern void riscv_fill_hwcap(void);`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void riscv_timer_interrupt(void)`
`84`	`84`
`85`	`85`	`static int __init riscv_timer_init_dt(struct device_node *n)`
`86`	`86`	`{`
`87`		`- int cpu_id = riscv_of_processor_hart(n), error;`
	`87`	`+ int cpu_id = riscv_of_processor_hartid(n), error;`
`88`	`88`	`struct clocksource *cs;`
`89`	`89`
`90`	`90`	`if (cpu_id != smp_processor_id())`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ static int plic_find_hart_id(struct device_node *node)`
`176`	`176`	`{`
`177`	`177`	`for (; node; node = node->parent) {`
`178`	`178`	`if (of_device_is_compatible(node, "riscv"))`
`179`		`- return riscv_of_processor_hart(node);`
	`179`	`+ return riscv_of_processor_hartid(node);`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`return -1;`