diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-10 11:08:05 -0500 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-03-10 14:48:35 -0500 |
commit | 76465b2dafb8ce471f115b6af80f7a67a1fda377 (patch) | |
tree | ec75ddd0ca1f4ab3c8288b842116777f84823159 | |
parent | a0e181167ee4254988c8c89d26ffd8ef4cb7deb0 (diff) |
xen: events: remove unused public functions
I was unable to find any user of these functions in either the
functionality pending for 2.6.39 or the xen/next-2.6.32 branch of
xen.git
An exception to this was xen_gsi_from_irq which did appear to be used
in xen/next-2.6.32's pciback. However in the 2.6.39 version of pciback
xen_pirq_from_irq is, correctly AFAICT, used instead.
Only a minority of functions in events.h use "extern" so drop it from
those places for consistency.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-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 a9c154d1d2ff..d52defda53b1 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c | |||
@@ -222,16 +222,6 @@ static unsigned gsi_from_irq(unsigned irq) | |||
222 | return info->u.pirq.gsi; | 222 | return info->u.pirq.gsi; |
223 | } | 223 | } |
224 | 224 | ||
225 | static unsigned vector_from_irq(unsigned irq) | ||
226 | { | ||
227 | struct irq_info *info = info_for_irq(irq); | ||
228 | |||
229 | BUG_ON(info == NULL); | ||
230 | BUG_ON(info->type != IRQT_PIRQ); | ||
231 | |||
232 | return info->u.pirq.vector; | ||
233 | } | ||
234 | |||
235 | static enum xen_irq_type type_from_irq(unsigned irq) | 225 | static enum xen_irq_type type_from_irq(unsigned irq) |
236 | { | 226 | { |
237 | return info_for_irq(irq)->type; | 227 | return info_for_irq(irq)->type; |
@@ -716,16 +706,6 @@ out: | |||
716 | return rc; | 706 | return rc; |
717 | } | 707 | } |
718 | 708 | ||
719 | int xen_vector_from_irq(unsigned irq) | ||
720 | { | ||
721 | return vector_from_irq(irq); | ||
722 | } | ||
723 | |||
724 | int xen_gsi_from_irq(unsigned irq) | ||
725 | { | ||
726 | return gsi_from_irq(irq); | ||
727 | } | ||
728 | |||
729 | int xen_irq_from_pirq(unsigned pirq) | 709 | int xen_irq_from_pirq(unsigned pirq) |
730 | { | 710 | { |
731 | return pirq_to_irq[pirq]; | 711 | return pirq_to_irq[pirq]; |
diff --git a/include/xen/events.h b/include/xen/events.h index f6fed9498aa3..99a64f045732 100644 --- a/include/xen/events.h +++ b/include/xen/events.h | |||
@@ -41,9 +41,9 @@ static inline void notify_remote_via_evtchn(int port) | |||
41 | (void)HYPERVISOR_event_channel_op(EVTCHNOP_send, &send); | 41 | (void)HYPERVISOR_event_channel_op(EVTCHNOP_send, &send); |
42 | } | 42 | } |
43 | 43 | ||
44 | extern void notify_remote_via_irq(int irq); | 44 | void notify_remote_via_irq(int irq); |
45 | 45 | ||
46 | extern void xen_irq_resume(void); | 46 | void xen_irq_resume(void); |
47 | 47 | ||
48 | /* Clear an irq's pending state, in preparation for polling on it */ | 48 | /* Clear an irq's pending state, in preparation for polling on it */ |
49 | void xen_clear_irq_pending(int irq); | 49 | void xen_clear_irq_pending(int irq); |
@@ -62,7 +62,7 @@ void xen_poll_irq_timeout(int irq, u64 timeout); | |||
62 | unsigned irq_from_evtchn(unsigned int evtchn); | 62 | unsigned irq_from_evtchn(unsigned int evtchn); |
63 | 63 | ||
64 | /* Xen HVM evtchn vector callback */ | 64 | /* Xen HVM evtchn vector callback */ |
65 | extern void xen_hvm_callback_vector(void); | 65 | void xen_hvm_callback_vector(void); |
66 | extern int xen_have_vector_callback; | 66 | extern int xen_have_vector_callback; |
67 | int xen_set_callback_via(uint64_t via); | 67 | int xen_set_callback_via(uint64_t via); |
68 | void xen_evtchn_do_upcall(struct pt_regs *regs); | 68 | 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, | |||
81 | /* De-allocates the above mentioned physical interrupt. */ | 81 | /* De-allocates the above mentioned physical interrupt. */ |
82 | int xen_destroy_irq(int irq); | 82 | int xen_destroy_irq(int irq); |
83 | 83 | ||
84 | /* Return vector allocated to pirq */ | ||
85 | int xen_vector_from_irq(unsigned pirq); | ||
86 | |||
87 | /* Return gsi allocated to pirq */ | ||
88 | int xen_gsi_from_irq(unsigned pirq); | ||
89 | |||
90 | /* Return irq from pirq */ | 84 | /* Return irq from pirq */ |
91 | int xen_irq_from_pirq(unsigned pirq); | 85 | int xen_irq_from_pirq(unsigned pirq); |
92 | 86 | ||