Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / net / irda / irport.c

diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c
index 5971315..98fa531 100644 (file)
--- a/drivers/net/irda/irport.c
+++ b/drivers/net/irda/irport.c
@@ -235,8 +235,7 @@ static int irport_close(struct irport_cb *self)
                   __FUNCTION__, self->io.sir_base);
        release_region(self->io.sir_base, self->io.sir_ext);
 
-       if (self->tx_buff.head)
-               kfree(self->tx_buff.head);
+       kfree(self->tx_buff.head);
        
        if (self->rx_buff.skb)
                kfree_skb(self->rx_buff.skb);
@@ -285,19 +284,6 @@ static void irport_start(struct irport_cb *self)
        outb(UART_IER_RLSI | UART_IER_RDI |UART_IER_THRI, iobase+UART_IER);
 }
 
-/*
- * 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)
  *
@@ -383,7 +369,7 @@ static void irport_change_speed(void *priv, __u32 speed)
  *    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;
@@ -1132,9 +1118,9 @@ static void __exit irport_cleanup(void)
        }
 }
 
-MODULE_PARM(io, "1-4i");
+module_param_array(io, int, NULL, 0);
 MODULE_PARM_DESC(io, "Base I/O addresses");
-MODULE_PARM(irq, "1-4i");
+module_param_array(irq, int, NULL, 0);
 MODULE_PARM_DESC(irq, "IRQ lines");
 
 MODULE_AUTHOR("Dag Brattli <dagb@cs.uit.no>");