arm: Fold irqchip_root_cell_shrink into irqchip_cell_init

[jailhouse.git] / hypervisor / arch / arm / include / asm / irqchip.h

diff --git a/hypervisor/arch/arm/include/asm/irqchip.h b/hypervisor/arch/arm/include/asm/irqchip.h
index bfee6241f2859df8851cf2c1b5413b7d33ae3e83..eb78a582cb2cf396525222016d1bd53566392ca9 100644 (file)
--- a/hypervisor/arch/arm/include/asm/irqchip.h
+++ b/hypervisor/arch/arm/include/asm/irqchip.h
@@ -55,14 +55,6 @@ struct irqchip_ops {
        int     (*mmio_access)(struct mmio_access *access);
 };
 
-/* Virtual interrupts waiting to be injected */
-struct pending_irq {
-       u32     virt_id;
-
-       struct pending_irq *next;
-       struct pending_irq *prev;
-} __attribute__((packed));
-
 unsigned int irqchip_mmio_count_regions(struct cell *cell);
 
 int irqchip_init(void);
@@ -72,7 +64,6 @@ void irqchip_cpu_shutdown(struct per_cpu *cpu_data);
 
 int irqchip_cell_init(struct cell *cell);
 void irqchip_cell_exit(struct cell *cell);
-void irqchip_root_cell_shrink(struct cell *cell);
 
 int irqchip_send_sgi(struct sgi *sgi);
 void irqchip_handle_irq(struct per_cpu *cpu_data);
@@ -81,7 +72,7 @@ void irqchip_eoi_irq(u32 irqn, bool deactivate);
 void irqchip_inject_pending(struct per_cpu *cpu_data);
 void irqchip_set_pending(struct per_cpu *cpu_data, u16 irq_id);
 
-bool spi_in_cell(struct cell *cell, unsigned int spi);
+bool irqchip_irq_in_cell(struct cell *cell, unsigned int irq_id);
 
 #endif /* __ASSEMBLY__ */
 #endif /* _JAILHOUSE_ASM_IRQCHIP_H */