git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[GFS2] Fix up merge of Linus' kernel into GFS2
[pandora-kernel.git]
/
drivers
/
net
/
irda
/
irport.c
diff --git
a/drivers/net/irda/irport.c
b/drivers/net/irda/irport.c
index
3d016a4
..
ba4f3eb
100644
(file)
--- a/
drivers/net/irda/irport.c
+++ b/
drivers/net/irda/irport.c
@@
-284,19
+284,6
@@
static void irport_start(struct irport_cb *self)
outb(UART_IER_RLSI | UART_IER_RDI |UART_IER_THRI, iobase+UART_IER);
}
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)
*
/*
* Function irport_get_fcr (speed)
*
@@
-382,7
+369,7
@@
static void irport_change_speed(void *priv, __u32 speed)
* we cannot use schedule_timeout() when we are in interrupt context
*
*/
* 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;
{
struct irport_cb *self;
__u32 speed = (__u32) task->param;
@@
-399,7
+386,7
@@
int __irport_change_speed(struct irda_task *task)
/* Locking notes : this function may be called from irq context with
* spinlock, via irport_write_wakeup(), or from non-interrupt without
* spinlock (from the task timer). Yuck !
/* Locking notes : this function may be called from irq context with
* spinlock, via irport_write_wakeup(), or from non-interrupt without
* spinlock (from the task timer). Yuck !
- * This is ugly, and unsafe is the spinlock is not already aquired.
+ * This is ugly, and unsafe is the spinlock is not already a
c
quired.
* This will be fixed when irda-task get rewritten.
* Jean II */
if (!spin_is_locked(&self->lock)) {
* This will be fixed when irda-task get rewritten.
* Jean II */
if (!spin_is_locked(&self->lock)) {
@@
-1103,7
+1090,7
@@
static int __init irport_init(void)
{
int i;
{
int i;
- for (i=0; (io[i] < 2000) && (i <
4
); i++) {
+ for (i=0; (io[i] < 2000) && (i <
ARRAY_SIZE(dev_self)
); i++) {
if (irport_open(i, io[i], irq[i]) != NULL)
return 0;
}
if (irport_open(i, io[i], irq[i]) != NULL)
return 0;
}
@@
-1125,15
+1112,15
@@
static void __exit irport_cleanup(void)
IRDA_DEBUG( 4, "%s()\n", __FUNCTION__);
IRDA_DEBUG( 4, "%s()\n", __FUNCTION__);
- for (i=0; i <
4
; i++) {
+ for (i=0; i <
ARRAY_SIZE(dev_self)
; i++) {
if (dev_self[i])
irport_close(dev_self[i]);
}
}
if (dev_self[i])
irport_close(dev_self[i]);
}
}
-
MODULE_PARM(io, "1-4i"
);
+
module_param_array(io, int, NULL, 0
);
MODULE_PARM_DESC(io, "Base I/O addresses");
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>");
MODULE_PARM_DESC(irq, "IRQ lines");
MODULE_AUTHOR("Dag Brattli <dagb@cs.uit.no>");