git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
net
/
irda
/
w83977af_ir.c
diff --git
a/drivers/net/irda/w83977af_ir.c
b/drivers/net/irda/w83977af_ir.c
index
64d8d3f
..
0ea65c4
100644
(file)
--- a/
drivers/net/irda/w83977af_ir.c
+++ b/
drivers/net/irda/w83977af_ir.c
@@
-245,10
+245,10
@@
int w83977af_open(int i, unsigned int iobase, unsigned int irq,
err = register_netdev(dev);
if (err) {
err = register_netdev(dev);
if (err) {
- ERROR("%s(), register_netdevice() failed!\n", __FUNCTION__);
+
IRDA_
ERROR("%s(), register_netdevice() failed!\n", __FUNCTION__);
goto err_out3;
}
goto err_out3;
}
- MESSAGE("IrDA: Registered device %s\n", dev->name);
+
IRDA_
MESSAGE("IrDA: Registered device %s\n", dev->name);
/* Need to store self somewhere */
dev_self[i] = self;
/* Need to store self somewhere */
dev_self[i] = self;
@@
-401,8
+401,8
@@
int w83977af_probe( int iobase, int irq, int dma)
switch_bank(iobase, SET7);
outb(0x40, iobase+7);
switch_bank(iobase, SET7);
outb(0x40, iobase+7);
- MESSAGE("W83977AF (IR) driver loaded. "
- "Version: 0x%02x\n", version);
+
IRDA_
MESSAGE("W83977AF (IR) driver loaded. "
+
"Version: 0x%02x\n", version);
return 0;
} else {
return 0;
} else {
@@
-691,7
+691,7
@@
static void w83977af_dma_xmit_complete(struct w83977af_ir *self)
IRDA_DEBUG(4, "%s(%ld)\n", __FUNCTION__ , jiffies);
IRDA_DEBUG(4, "%s(%ld)\n", __FUNCTION__ , jiffies);
- ASSERT(self != NULL, return;);
+
IRDA_
ASSERT(self != NULL, return;);
iobase = self->io.fir_base;
iobase = self->io.fir_base;
@@
-743,7
+743,7
@@
int w83977af_dma_receive(struct w83977af_ir *self)
unsigned long flags;
__u8 hcr;
#endif
unsigned long flags;
__u8 hcr;
#endif
- ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
IRDA_DEBUG(4, "%s\n", __FUNCTION__ );
IRDA_DEBUG(4, "%s\n", __FUNCTION__ );
@@
-945,7
+945,7
@@
static void w83977af_pio_receive(struct w83977af_ir *self)
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
- ASSERT(self != NULL, return;);
+
IRDA_
ASSERT(self != NULL, return;);
iobase = self->io.fir_base;
iobase = self->io.fir_base;
@@
-1163,7
+1163,7
@@
static int w83977af_is_receiving(struct w83977af_ir *self)
int iobase;
__u8 set;
int iobase;
__u8 set;
- ASSERT(self != NULL, return FALSE;);
+
IRDA_
ASSERT(self != NULL, return FALSE;);
if (self->io.speed > 115200) {
iobase = self->io.fir_base;
if (self->io.speed > 115200) {
iobase = self->io.fir_base;
@@
-1197,10
+1197,10
@@
static int w83977af_net_open(struct net_device *dev)
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
- ASSERT(dev != NULL, return -1;);
+
IRDA_
ASSERT(dev != NULL, return -1;);
self = (struct w83977af_ir *) dev->priv;
self = (struct w83977af_ir *) dev->priv;
- ASSERT(self != NULL, return 0;);
+
IRDA_
ASSERT(self != NULL, return 0;);
iobase = self->io.fir_base;
iobase = self->io.fir_base;
@@
-1260,11
+1260,11
@@
static int w83977af_net_close(struct net_device *dev)
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
- ASSERT(dev != NULL, return -1;);
+
IRDA_
ASSERT(dev != NULL, return -1;);
self = (struct w83977af_ir *) dev->priv;
self = (struct w83977af_ir *) dev->priv;
- ASSERT(self != NULL, return 0;);
+
IRDA_
ASSERT(self != NULL, return 0;);
iobase = self->io.fir_base;
iobase = self->io.fir_base;
@@
-1307,11
+1307,11
@@
static int w83977af_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
unsigned long flags;
int ret = 0;
unsigned long flags;
int ret = 0;
- ASSERT(dev != NULL, return -1;);
+
IRDA_
ASSERT(dev != NULL, return -1;);
self = dev->priv;
self = dev->priv;
- ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__ , dev->name, cmd);
IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__ , dev->name, cmd);
@@
-1355,11
+1355,11
@@
MODULE_DESCRIPTION("Winbond W83977AF IrDA Device Driver");
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");
-
MODULE_PARM(qos_mtt_bits, "i"
);
+
module_param(qos_mtt_bits, int, 0
);
MODULE_PARM_DESC(qos_mtt_bits, "Mimimum Turn Time");
MODULE_PARM_DESC(qos_mtt_bits, "Mimimum Turn Time");
-
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_PARM_DESC(irq, "IRQ lines");
/*