Skip to contentSkip to conversation

ia64: Fix some warnings introduced in merge window

PATCH New Tony Luck 1 participant 1 message Sep 24, 2019

lore
Share & tools
lore

Tony Luck

author
#0 lore raw

PATCH 1/1 ia64: Fix some warnings introduced in merge window

arch/ia64/kernel/irq_ia64.c:586:1: warning: no return statement in function returning non-void [-Wr eturn-type]
arch/ia64/mm/contig.c:111:6: warning: unused variable 'rc' [-Wunused-variable] arch/ia64/mm/discontig.c:189:39: warning: unused variable 'rc' [-Wunused-variable]

---
 arch/ia64/kernel/irq_ia64.c | 1 +
 arch/ia64/mm/contig.c       | 1 -
 arch/ia64/mm/discontig.c    | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
arch/ia64/kernel/irq_ia64.c +1 -0
index f10208478131..8e91c86e8072 100644
@@ -583,6 +583,7 @@ void ia64_process_pending_intr(void)
 static irqreturn_t dummy_handler (int irq, void *dev_id)
 {
 	BUG();
+	return IRQ_NONE;
 }
 
 static struct irqaction ipi_irqaction = {
arch/ia64/mm/contig.c +0 -1
index db09a693f094..5b00dc3898e1 100644
@@ -108,7 +108,6 @@ setup_per_cpu_areas(void)
 	struct pcpu_group_info *gi;
 	unsigned int cpu;
 	ssize_t static_size, reserved_size, dyn_size;
-	int rc;
 
 	ai = pcpu_alloc_alloc_info(1, num_possible_cpus());
 	if (!ai)
arch/ia64/mm/discontig.c +1 -1
index 219fc640414b..4f33f6e7e206 100644
@@ -186,7 +186,7 @@ void __init setup_per_cpu_areas(void)
 	unsigned long base_offset;
 	unsigned int cpu;
 	ssize_t static_size, reserved_size, dyn_size;
-	int node, prev_node, unit, nr_units, rc;
+	int node, prev_node, unit, nr_units;
 
 	ai = pcpu_alloc_alloc_info(MAX_NUMNODES, nr_cpu_ids);
 	if (!ai)
Signature · 1 line
2.20.1