patch-2.4.20 linux-2.4.20/drivers/net/irda/w83977af_ir.c
Next file: linux-2.4.20/drivers/net/lasi_82596.c
Previous file: linux-2.4.20/drivers/net/irda/toshoboe.c
Back to the patch index
Back to the overall index
- Lines: 290
- Date:
Thu Nov 28 15:53:13 2002
- Orig file:
linux-2.4.19/drivers/net/irda/w83977af_ir.c
- Orig date:
Mon Feb 25 11:37:59 2002
diff -urN linux-2.4.19/drivers/net/irda/w83977af_ir.c linux-2.4.20/drivers/net/irda/w83977af_ir.c
@@ -117,7 +117,7 @@
{
int i;
- IRDA_DEBUG(0, __FUNCTION__ "()\n");
+ IRDA_DEBUG(0, "%s\n", __FUNCTION__);
for (i=0; (io[i] < 2000) && (i < 4); i++) {
int ioaddr = io[i];
@@ -140,7 +140,7 @@
{
int i;
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s\n", __FUNCTION__);
for (i=0; i < 4; i++) {
if (dev_self[i])
@@ -163,7 +163,7 @@
void *ret;
int err;
- IRDA_DEBUG(0, __FUNCTION__ "()\n");
+ IRDA_DEBUG(0, "%s\n", __FUNCTION__);
if (w83977af_probe(iobase, irq, dma) == -1)
return -1;
@@ -192,8 +192,8 @@
/* Lock the port that we need */
ret = request_region(self->io.fir_base, self->io.fir_ext, driver_name);
if (!ret) {
- IRDA_DEBUG(0, __FUNCTION__ "(), can't get iobase of 0x%03x\n",
- self->io.fir_base);
+ IRDA_DEBUG(0, "%s(), can't get iobase of 0x%03x\n",
+ __FUNCTION__, self->io.fir_base);
/* w83977af_cleanup( self); */
return -ENODEV;
}
@@ -239,7 +239,7 @@
self->rx_buff.data = self->rx_buff.head;
if (!(dev = dev_alloc("irda%d", &err))) {
- ERROR(__FUNCTION__ "(), dev_alloc() failed!\n");
+ ERROR("%s(), dev_alloc() failed!\n", __FUNCTION__);
return -ENOMEM;
}
dev->priv = (void *) self;
@@ -257,7 +257,7 @@
err = register_netdevice(dev);
rtnl_unlock();
if (err) {
- ERROR(__FUNCTION__ "(), register_netdevice() failed!\n");
+ ERROR("%s(), register_netdevice() failed!\n", __FUNCTION__);
return -1;
}
MESSAGE("IrDA: Registered device %s\n", dev->name);
@@ -275,7 +275,7 @@
{
int iobase;
- IRDA_DEBUG(0, __FUNCTION__ "()\n");
+ IRDA_DEBUG(0, "%s\n", __FUNCTION__);
iobase = self->io.fir_base;
@@ -299,8 +299,8 @@
}
/* Release the PORT that this driver is using */
- IRDA_DEBUG(0 , __FUNCTION__ "(), Releasing Region %03x\n",
- self->io.fir_base);
+ IRDA_DEBUG(0 , "%s(), Releasing Region %03x\n",
+ __FUNCTION__, self->io.fir_base);
release_region(self->io.fir_base, self->io.fir_ext);
if (self->tx_buff.head)
@@ -320,7 +320,7 @@
int i;
for (i=0; i < 2; i++) {
- IRDA_DEBUG( 0, __FUNCTION__ "()\n");
+ IRDA_DEBUG( 0, "%s\n", __FUNCTION__);
#ifdef CONFIG_USE_W977_PNP
/* Enter PnP configuration mode */
w977_efm_enter(efbase[i]);
@@ -407,7 +407,7 @@
return 0;
} else {
/* Try next extented function register address */
- IRDA_DEBUG( 0, __FUNCTION__ "(), Wrong chip version");
+ IRDA_DEBUG( 0, "%s(), Wrong chip version", __FUNCTION__);
}
}
return -1;
@@ -443,19 +443,19 @@
case 115200: outb(0x01, iobase+ABLL); break;
case 576000:
ir_mode = HCR_MIR_576;
- IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 576000\n");
+ IRDA_DEBUG(0, "%s(), handling baud of 576000\n", __FUNCTION__);
break;
case 1152000:
ir_mode = HCR_MIR_1152;
- IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 1152000\n");
+ IRDA_DEBUG(0, "%s(), handling baud of 1152000\n", __FUNCTION__);
break;
case 4000000:
ir_mode = HCR_FIR;
- IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 4000000\n");
+ IRDA_DEBUG(0, "%s(), handling baud of 4000000\n", __FUNCTION__);
break;
default:
ir_mode = HCR_FIR;
- IRDA_DEBUG(0, __FUNCTION__ "(), unknown baud rate of %d\n", speed);
+ IRDA_DEBUG(0, "%s(), unknown baud rate of %d\n", __FUNCTION__, speed);
break;
}
@@ -505,7 +505,7 @@
iobase = self->io.fir_base;
- IRDA_DEBUG(4, __FUNCTION__ "(%ld), skb->len=%d\n", jiffies,
+ IRDA_DEBUG(4, "%s(%ld), skb->len=%d\n", __FUNCTION__, jiffies,
(int) skb->len);
/* Lock transmit buffer */
@@ -552,7 +552,7 @@
outb(ICR_ETMRI, iobase+ICR);
} else {
#endif
- IRDA_DEBUG(4,__FUNCTION__ "(%ld), mtt=%d\n", jiffies, mtt);
+ IRDA_DEBUG(4, "%s(%ld), mtt=%d\n", __FUNCTION__, jiffies, mtt);
if (mtt)
udelay(mtt);
@@ -593,7 +593,7 @@
unsigned long flags;
__u8 hcr;
#endif
- IRDA_DEBUG(4, __FUNCTION__ "(), len=%d\n", self->tx_buff.len);
+ IRDA_DEBUG(4, "%s(), len=%d\n", __FUNCTION__, self->tx_buff.len);
/* Save current set */
set = inb(iobase+SSR);
@@ -646,19 +646,18 @@
int actual = 0;
__u8 set;
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s\n", __FUNCTION__);
/* Save current bank */
set = inb(iobase+SSR);
switch_bank(iobase, SET0);
if (!(inb_p(iobase+USR) & USR_TSRE)) {
- IRDA_DEBUG(4, __FUNCTION__
- "(), warning, FIFO not empty yet!\n");
+ IRDA_DEBUG(4, "%s(), warning, FIFO not empty yet!\n", __FUNCTION__);
fifo_size -= 17;
- IRDA_DEBUG(4, __FUNCTION__ "%d bytes left in tx fifo\n",
- fifo_size);
+ IRDA_DEBUG(4, "%s(), %d bytes left in tx fifo\n",
+ __FUNCTION__, fifo_size);
}
/* Fill FIFO with current frame */
@@ -667,8 +666,8 @@
outb(buf[actual++], iobase+TBR);
}
- IRDA_DEBUG(4, __FUNCTION__ "(), fifo_size %d ; %d sent of %d\n",
- fifo_size, actual, len);
+ IRDA_DEBUG(4, "%s(), fifo_size %d ; %d sent of %d\n",
+ __FUNCTION__, fifo_size, actual, len);
/* Restore bank */
outb(set, iobase+SSR);
@@ -688,7 +687,7 @@
int iobase;
__u8 set;
- IRDA_DEBUG(4, __FUNCTION__ "(%ld)\n", jiffies);
+ IRDA_DEBUG(4, "%s(%ld)\n", __FUNCTION__, jiffies);
ASSERT(self != NULL, return;);
@@ -703,7 +702,7 @@
/* Check for underrrun! */
if (inb(iobase+AUDR) & AUDR_UNDR) {
- IRDA_DEBUG(0, __FUNCTION__ "(), Transmit underrun!\n");
+ IRDA_DEBUG(0, "%s(), Transmit underrun!\n", __FUNCTION__);
self->stats.tx_errors++;
self->stats.tx_fifo_errors++;
@@ -744,7 +743,7 @@
#endif
ASSERT(self != NULL, return -1;);
- IRDA_DEBUG(4, __FUNCTION__ "\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
iobase= self->io.fir_base;
@@ -816,7 +815,7 @@
__u8 set;
__u8 status;
- IRDA_DEBUG(4, __FUNCTION__ "\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
st_fifo = &self->st_fifo;
@@ -895,8 +894,7 @@
skb = dev_alloc_skb(len+1);
if (skb == NULL) {
- printk(KERN_INFO __FUNCTION__
- "(), memory squeeze, dropping frame.\n");
+ printk(KERN_INFO "%s(), memory squeeze, dropping frame.\n", __FUNCTION__);
/* Restore set register */
outb(set, iobase+SSR);
@@ -942,7 +940,7 @@
__u8 byte = 0x00;
int iobase;
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s\n", __FUNCTION__);
ASSERT(self != NULL, return;);
@@ -969,7 +967,7 @@
__u8 set;
int iobase;
- IRDA_DEBUG(4, __FUNCTION__ "(), isr=%#x\n", isr);
+ IRDA_DEBUG(4, "%s(), isr=%#x\n", __FUNCTION__, isr);
iobase = self->io.fir_base;
/* Transmit FIFO low on data */
@@ -1005,8 +1003,7 @@
if (isr & ISR_TXEMP_I) {
/* Check if we need to change the speed? */
if (self->new_speed) {
- IRDA_DEBUG(2, __FUNCTION__
- "(), Changing speed!\n");
+ IRDA_DEBUG(2, "%s(), Changing speed!\n", __FUNCTION__);
w83977af_change_speed(self, self->new_speed);
self->new_speed = 0;
}
@@ -1188,7 +1185,7 @@
*/
static int w83977af_net_init(struct net_device *dev)
{
- IRDA_DEBUG(0, __FUNCTION__ "()\n");
+ IRDA_DEBUG(0, "%s\n", __FUNCTION__);
/* Set up to be a normal IrDA network device driver */
irda_device_setup(dev);
@@ -1212,7 +1209,7 @@
char hwname[32];
__u8 set;
- IRDA_DEBUG(0, __FUNCTION__ "()\n");
+ IRDA_DEBUG(0, "%s\n", __FUNCTION__);
ASSERT(dev != NULL, return -1;);
self = (struct w83977af_ir *) dev->priv;
@@ -1277,7 +1274,7 @@
int iobase;
__u8 set;
- IRDA_DEBUG(0, __FUNCTION__ "()\n");
+ IRDA_DEBUG(0, "%s\n", __FUNCTION__);
ASSERT(dev != NULL, return -1;);
@@ -1334,7 +1331,7 @@
ASSERT(self != NULL, return -1;);
- IRDA_DEBUG(2, __FUNCTION__ "(), %s, (cmd=0x%X)\n", dev->name, cmd);
+ IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__, dev->name, cmd);
/* Disable interrupts & save flags */
save_flags(flags);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)