[IA64] iosapic cleanup

Make some IOSAPIC functions static and remove one that is unused.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Simon Horman 2007-12-07 14:44:05 -08:00 committed by Tony Luck
parent b9ab117c2f
commit 9e004ebd2d
2 changed files with 3 additions and 18 deletions

View file

@ -199,19 +199,6 @@ static inline int __gsi_to_irq(unsigned int gsi)
return -1; return -1;
} }
/*
* Translate GSI number to the corresponding IA-64 interrupt vector. If no
* entry exists, return -1.
*/
inline int
gsi_to_vector (unsigned int gsi)
{
int irq = __gsi_to_irq(gsi);
if (check_irq_used(irq) < 0)
return -1;
return irq_to_vector(irq);
}
int int
gsi_to_irq (unsigned int gsi) gsi_to_irq (unsigned int gsi)
{ {
@ -429,7 +416,7 @@ iosapic_end_level_irq (unsigned int irq)
#define iosapic_disable_level_irq mask_irq #define iosapic_disable_level_irq mask_irq
#define iosapic_ack_level_irq nop #define iosapic_ack_level_irq nop
struct irq_chip irq_type_iosapic_level = { static struct irq_chip irq_type_iosapic_level = {
.name = "IO-SAPIC-level", .name = "IO-SAPIC-level",
.startup = iosapic_startup_level_irq, .startup = iosapic_startup_level_irq,
.shutdown = iosapic_shutdown_level_irq, .shutdown = iosapic_shutdown_level_irq,
@ -478,7 +465,7 @@ iosapic_ack_edge_irq (unsigned int irq)
#define iosapic_disable_edge_irq nop #define iosapic_disable_edge_irq nop
#define iosapic_end_edge_irq nop #define iosapic_end_edge_irq nop
struct irq_chip irq_type_iosapic_edge = { static struct irq_chip irq_type_iosapic_edge = {
.name = "IO-SAPIC-edge", .name = "IO-SAPIC-edge",
.startup = iosapic_startup_edge_irq, .startup = iosapic_startup_edge_irq,
.shutdown = iosapic_disable_edge_irq, .shutdown = iosapic_disable_edge_irq,
@ -491,7 +478,7 @@ struct irq_chip irq_type_iosapic_edge = {
.set_affinity = iosapic_set_affinity .set_affinity = iosapic_set_affinity
}; };
unsigned int static unsigned int
iosapic_version (char __iomem *addr) iosapic_version (char __iomem *addr)
{ {
/* /*

View file

@ -80,7 +80,6 @@ extern int iosapic_remove (unsigned int gsi_base);
#else #else
#define iosapic_remove(gsi_base) (-EINVAL) #define iosapic_remove(gsi_base) (-EINVAL)
#endif /* CONFIG_HOTPLUG */ #endif /* CONFIG_HOTPLUG */
extern int gsi_to_vector (unsigned int gsi);
extern int gsi_to_irq (unsigned int gsi); extern int gsi_to_irq (unsigned int gsi);
extern int iosapic_register_intr (unsigned int gsi, unsigned long polarity, extern int iosapic_register_intr (unsigned int gsi, unsigned long polarity,
unsigned long trigger); unsigned long trigger);
@ -94,7 +93,6 @@ extern int __init iosapic_register_platform_intr (u32 int_type,
u16 eid, u16 id, u16 eid, u16 id,
unsigned long polarity, unsigned long polarity,
unsigned long trigger); unsigned long trigger);
extern unsigned int iosapic_version (char __iomem *addr);
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
extern void __devinit map_iosapic_to_node (unsigned int, int); extern void __devinit map_iosapic_to_node (unsigned int, int);