diff -Nru a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c --- a/drivers/net/irda/irport.c Mon Jan 26 14:36:40 2004 +++ b/drivers/net/irda/irport.c Mon Jan 26 14:36:40 2004 @@ -87,16 +87,17 @@ static int irport_change_speed_complete(struct irda_task *task); static void irport_timeout(struct net_device *dev); -EXPORT_SYMBOL(irport_open); -EXPORT_SYMBOL(irport_close); -EXPORT_SYMBOL(irport_start); -EXPORT_SYMBOL(irport_stop); -EXPORT_SYMBOL(irport_interrupt); -EXPORT_SYMBOL(irport_hard_xmit); -EXPORT_SYMBOL(irport_timeout); -EXPORT_SYMBOL(irport_change_speed); -EXPORT_SYMBOL(irport_net_open); -EXPORT_SYMBOL(irport_net_close); +static struct irport_cb *irport_open(int i, unsigned int iobase, + unsigned int irq); +static int irport_close(struct irport_cb *self); +static irqreturn_t irport_interrupt(int irq, void *dev_id, + struct pt_regs *regs); +static void irport_start(struct irport_cb *self); +static void irport_stop(struct irport_cb *self); +static void irport_change_speed(void *priv, __u32 speed); +static int irport_hard_xmit(struct sk_buff *skb, struct net_device *dev); +static int irport_net_open(struct net_device *dev); +static int irport_net_close(struct net_device *dev); static int __init irport_init(void) { @@ -130,7 +131,7 @@ } } -struct irport_cb * +static struct irport_cb * irport_open(int i, unsigned int iobase, unsigned int irq) { struct net_device *dev; @@ -257,7 +258,7 @@ return NULL; } -int irport_close(struct irport_cb *self) +static int irport_close(struct irport_cb *self) { ASSERT(self != NULL, return -1;); @@ -288,7 +289,7 @@ return 0; } -void irport_start(struct irport_cb *self) +static void irport_start(struct irport_cb *self) { int iobase; @@ -306,7 +307,7 @@ outb(UART_IER_RLSI | UART_IER_RDI |UART_IER_THRI, iobase+UART_IER); } -void irport_stop(struct irport_cb *self) +static void irport_stop(struct irport_cb *self) { int iobase; @@ -325,19 +326,6 @@ } /* - * Function irport_probe (void) - * - * Start IO port - * - */ -int irport_probe(int iobase) -{ - IRDA_DEBUG(4, "%s(), iobase=%#x\n", __FUNCTION__, iobase); - - return 0; -} - -/* * Function irport_get_fcr (speed) * * Compute value of fcr @@ -371,7 +359,7 @@ * * This function should be called with irq off and spin-lock. */ -void irport_change_speed(void *priv, __u32 speed) +static void irport_change_speed(void *priv, __u32 speed) { struct irport_cb *self = (struct irport_cb *) priv; int iobase; @@ -422,7 +410,7 @@ * we cannot use schedule_timeout() when we are in interrupt context * */ -int __irport_change_speed(struct irda_task *task) +static int __irport_change_speed(struct irda_task *task) { struct irport_cb *self; __u32 speed = (__u32) task->param; @@ -622,7 +610,7 @@ * waits until the next transmitt interrupt, and continues until the * frame is transmitted. */ -int irport_hard_xmit(struct sk_buff *skb, struct net_device *dev) +static int irport_hard_xmit(struct sk_buff *skb, struct net_device *dev) { struct irport_cb *self; unsigned long flags; @@ -817,7 +805,7 @@ * * Interrupt handler */ -irqreturn_t irport_interrupt(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t irport_interrupt(int irq, void *dev_id, struct pt_regs *regs) { struct net_device *dev = (struct net_device *) dev_id; struct irport_cb *self; @@ -891,7 +879,7 @@ * Network device is taken up. Usually this is done by "ifconfig irda0 up" * */ -int irport_net_open(struct net_device *dev) +static int irport_net_open(struct net_device *dev) { struct irport_cb *self; int iobase; @@ -944,7 +932,7 @@ * Network device is taken down. Usually this is done by * "ifconfig irda0 down" */ -int irport_net_close(struct net_device *dev) +static int irport_net_close(struct net_device *dev) { struct irport_cb *self; int iobase; diff -Nru a/include/net/irda/irport.h b/include/net/irda/irport.h --- a/include/net/irda/irport.h Mon Jan 26 14:36:40 2004 +++ b/include/net/irda/irport.h Mon Jan 26 14:36:40 2004 @@ -77,14 +77,4 @@ int (*interrupt)(int irq, void *dev_id, struct pt_regs *regs); }; -struct irport_cb *irport_open(int i, unsigned int iobase, unsigned int irq); -int irport_close(struct irport_cb *self); -void irport_start(struct irport_cb *self); -void irport_stop(struct irport_cb *self); -void irport_change_speed(void *priv, __u32 speed); -irqreturn_t irport_interrupt(int irq, void *dev_id, struct pt_regs *regs); -int irport_hard_xmit(struct sk_buff *skb, struct net_device *dev); -int irport_net_open(struct net_device *dev); -int irport_net_close(struct net_device *dev); - #endif /* IRPORT_H */