diff --git a/util/getpir/code_gen.c b/util/getpir/code_gen.c
index 81d6b2c9f9..96f2f3dad2 100644
--- a/util/getpir/code_gen.c
+++ b/util/getpir/code_gen.c
@@ -50,7 +50,7 @@ void code_gen(char *filename, struct irq_routing_table *rt)
 		fprintf(fpir, "%s", *code++);
 
 	fprintf(fpir, "\t32 + 16 * %d,		/* Max. number of devices on the bus */\n",
-		ts, ts);
+		ts);
 	fprintf(fpir, "\t0x%02x,			/* Interrupt router bus */\n",
 		rt->rtr_bus);
 	fprintf(fpir, "\t(0x%02x << 3) | 0x%01x,	/* Interrupt router dev */\n",
diff --git a/util/getpir/pirq_routing.h b/util/getpir/pirq_routing.h
index ba69fb7c8d..44035ad432 100644
--- a/util/getpir/pirq_routing.h
+++ b/util/getpir/pirq_routing.h
@@ -39,6 +39,10 @@ struct irq_routing_table {
 
 extern const struct irq_routing_table intel_irq_routing_table;
 
+#ifdef GETPIR
+#define copy_pirq_routing_table(start) (start)
+unsigned long write_pirq_routing_table(unsigned long start);
+#else
 #if CONFIG_HAVE_PIRQ_TABLE==1
 unsigned long copy_pirq_routing_table(unsigned long start);
 unsigned long write_pirq_routing_table(unsigned long start);
@@ -46,5 +50,6 @@ unsigned long write_pirq_routing_table(unsigned long start);
 #define copy_pirq_routing_table(start) (start)
 #define write_pirq_routing_table(start) (start)
 #endif
+#endif
 
 #endif /* ARCH_PIRQ_ROUTING_H */