diff options
-rw-r--r-- | drivers/xen/events.c | 20 | ||||
-rw-r--r-- | include/xen/events.h | 12 |
2 files changed, 3 insertions, 29 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index a9c154d1d2f..d52defda53b 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -222,16 +222,6 @@ static unsigned gsi_from_irq(unsigned irq) return info->u.pirq.gsi; } -static unsigned vector_from_irq(unsigned irq) -{ - struct irq_info *info = info_for_irq(irq); - - BUG_ON(info == NULL); - BUG_ON(info->type != IRQT_PIRQ); - - return info->u.pirq.vector; -} - static enum xen_irq_type type_from_irq(unsigned irq) { return info_for_irq(irq)->type; @@ -716,16 +706,6 @@ out: return rc; } -int xen_vector_from_irq(unsigned irq) -{ - return vector_from_irq(irq); -} - -int xen_gsi_from_irq(unsigned irq) -{ - return gsi_from_irq(irq); -} - int xen_irq_from_pirq(unsigned pirq) { return pirq_to_irq[pirq]; diff --git a/include/xen/events.h b/include/xen/events.h index f6fed9498aa..99a64f04573 100644 --- a/include/xen/events.h +++ b/include/xen/events.h @@ -41,9 +41,9 @@ static inline void notify_remote_via_evtchn(int port) (void)HYPERVISOR_event_channel_op(EVTCHNOP_send, &send); } -extern void notify_remote_via_irq(int irq); +void notify_remote_via_irq(int irq); -extern void xen_irq_resume(void); +void xen_irq_resume(void); /* Clear an irq's pending state, in preparation for polling on it */ void xen_clear_irq_pending(int irq); @@ -62,7 +62,7 @@ void xen_poll_irq_timeout(int irq, u64 timeout); unsigned irq_from_evtchn(unsigned int evtchn); /* Xen HVM evtchn vector callback */ -extern void xen_hvm_callback_vector(void); +void xen_hvm_callback_vector(void); extern int xen_have_vector_callback; int xen_set_callback_via(uint64_t via); void xen_evtchn_do_upcall(struct pt_regs *regs); @@ -81,12 +81,6 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, /* De-allocates the above mentioned physical interrupt. */ int xen_destroy_irq(int irq); -/* Return vector allocated to pirq */ -int xen_vector_from_irq(unsigned pirq); - -/* Return gsi allocated to pirq */ -int xen_gsi_from_irq(unsigned pirq); - /* Return irq from pirq */ int xen_irq_from_pirq(unsigned pirq); |