Skip to content

L
linux
Commit 887e8e0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge http://gkernel.bkbits.net/irda-2.5 

into home.transmeta.com:/home/torvalds/v2.5/linux
parents bef9636e 94df6c69
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1024 additions and 1006 deletions
drivers/net/irda/act200l.c
View file @ 887e8e0f
......@@ -106,7 +106,7 @@ void __exit act200l_cleanup(void)
static void act200l_open(dongle_t *self, struct qos_info *qos)
{
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
/* Power on the dongle */
self->set_dtr_rts(self->dev, TRUE, TRUE);
......@@ -120,7 +120,7 @@ static void act200l_open(dongle_t *self, struct qos_info *qos)
static void act200l_close(dongle_t *self)
{
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
/* Power off the dongle */
self->set_dtr_rts(self->dev, FALSE, FALSE);
......@@ -141,7 +141,7 @@ static int act200l_change_speed(struct irda_task *task)
__u8 control[3];
int ret = 0;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
self->speed_task = task;
......@@ -233,7 +233,7 @@ static int act200l_reset(struct irda_task *task)
};
int ret = 0;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
self->reset_task = task;
......
drivers/net/irda/ali-ircc.c
View file @ 887e8e0f
This diff is collapsed.
drivers/net/irda/smc-ircc.c
View file @ 887e8e0f
......@@ -170,7 +170,7 @@ static inline void register_bank(int iobase, int bank)
static int __init smc_access(unsigned short cfg_base,unsigned char reg)
{
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
outb(reg, cfg_base);
......@@ -184,7 +184,7 @@ static const smc_chip_t * __init smc_probe(unsigned short cfg_base,u8 reg,const
{
u8 devid,xdevid,rev;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
/* Leave configuration */
......@@ -263,7 +263,7 @@ static int __init smc_superio_flat(const smc_chip_t *chips, unsigned short cfg_b
u8 mode;
int ret = -ENODEV;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
if (smc_probe(cfg_base,0xD,chips,type)==NULL)
return ret;
......@@ -307,7 +307,7 @@ static int __init smc_superio_paged(const smc_chip_t *chips, unsigned short cfg_
unsigned short sir_io;
int ret = -ENODEV;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
if (smc_probe(cfg_base,0x20,chips,type)==NULL)
return ret;
......@@ -343,7 +343,7 @@ static int __init smc_superio_paged(const smc_chip_t *chips, unsigned short cfg_
static int __init smc_superio_fdc(unsigned short cfg_base)
{
if (check_region(cfg_base, 2) < 0) {
IRDA_DEBUG(0, __FUNCTION__ ": can't get cfg_base of 0x%03x\n",
IRDA_DEBUG(0, "%s: can't get cfg_base of 0x%03x\n", __FUNCTION__ ,
cfg_base);
return -1;
}
......@@ -358,7 +358,7 @@ static int __init smc_superio_lpc(unsigned short cfg_base)
{
#if 0
if (check_region(cfg_base, 2) < 0) {
IRDA_DEBUG(0, __FUNCTION__ ": can't get cfg_base of 0x%03x\n",
IRDA_DEBUG(0, "%s: can't get cfg_base of 0x%03x\n", __FUNCTION__ ,
cfg_base);
return -1;
}
......@@ -380,7 +380,7 @@ int __init ircc_init(void)
{
int ret=-ENODEV;
IRDA_DEBUG(0, __FUNCTION__ "\n");
IRDA_DEBUG(0, "%s\n", __FUNCTION__ );
dev_count=0;
......@@ -403,8 +403,8 @@ int __init ircc_init(void)
/* Trys to open for all the SMC chipsets we know about */
IRDA_DEBUG(0, __FUNCTION__
" Try to open all known SMC chipsets\n");
IRDA_DEBUG(0,
"%s Try to open all known SMC chipsets\n", __FUNCTION__ );
if (!smc_superio_fdc(0x3f0))
ret=0;
......@@ -434,16 +434,16 @@ static int __init ircc_open(unsigned int fir_base, unsigned int sir_base)
unsigned long flags;
IRDA_DEBUG(0, __FUNCTION__ "\n");
IRDA_DEBUG(0, "%s\n", __FUNCTION__ );
if (check_region(fir_base, CHIP_IO_EXTENT) < 0) {
IRDA_DEBUG(0, __FUNCTION__ ": can't get fir_base of 0x%03x\n",
IRDA_DEBUG(0, "%s: can't get fir_base of 0x%03x\n", __FUNCTION__ ,
fir_base);
return -ENODEV;
}
#if POSSIBLE_USED_BY_SERIAL_DRIVER
if (check_region(sir_base, CHIP_IO_EXTENT) < 0) {
IRDA_DEBUG(0, __FUNCTION__ ": can't get sir_base of 0x%03x\n",
IRDA_DEBUG(0, "%s: can't get sir_base of 0x%03x\n", __FUNCTION__ ,
sir_base);
return -ENODEV;
}
......@@ -461,8 +461,8 @@ static int __init ircc_open(unsigned int fir_base, unsigned int sir_base)
dma = config & 0x0f;
if (high != 0x10 || low != 0xb8 || (chip != 0xf1 && chip != 0xf2)) {
IRDA_DEBUG(0, __FUNCTION__
"(), addr 0x%04x - no device found!\n", fir_base);
IRDA_DEBUG(0,
"%s(), addr 0x%04x - no device found!\n", __FUNCTION__ , fir_base);
return -ENODEV;
}
MESSAGE("SMC IrDA Controller found\n IrCC version %d.%d, "
......@@ -470,8 +470,8 @@ static int __init ircc_open(unsigned int fir_base, unsigned int sir_base)
chip & 0x0f, version, fir_base, sir_base, dma, irq);
if (dev_count>DIM(dev_self)) {
IRDA_DEBUG(0, __FUNCTION__
"(), to many devices!\n");
IRDA_DEBUG(0,
"%s(), to many devices!\n", __FUNCTION__ );
return -ENOMEM;
}
......@@ -610,7 +610,7 @@ static void ircc_change_speed(void *priv, u32 speed)
struct ircc_cb *self = (struct ircc_cb *) priv;
struct net_device *dev;
IRDA_DEBUG(0, __FUNCTION__ "\n");
IRDA_DEBUG(0, "%s\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
......@@ -625,7 +625,7 @@ static void ircc_change_speed(void *priv, u32 speed)
switch (speed) {
default:
IRDA_DEBUG(0, __FUNCTION__ "(), unknown baud rate of %d\n",
IRDA_DEBUG(0, "%s(), unknown baud rate of %d\n", __FUNCTION__ ,
speed);
/* FALLTHROUGH */
case 9600:
......@@ -641,19 +641,19 @@ static void ircc_change_speed(void *priv, u32 speed)
ir_mode = IRCC_CFGA_IRDA_HDLC;
ctrl = IRCC_CRC;
fast = 0;
IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 576000\n");
IRDA_DEBUG(0, "%s(), handling baud of 576000\n", __FUNCTION__ );
break;
case 1152000:
ir_mode = IRCC_CFGA_IRDA_HDLC;
ctrl = IRCC_1152 | IRCC_CRC;
fast = 0;
IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 1152000\n");
IRDA_DEBUG(0, "%s(), handling baud of 1152000\n", __FUNCTION__ );
break;
case 4000000:
ir_mode = IRCC_CFGA_IRDA_4PPM;
ctrl = IRCC_CRC;
fast = IRCC_LCR_A_FAST;
IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 4000000\n");
IRDA_DEBUG(0, "%s(), handling baud of 4000000\n", __FUNCTION__ );
break;
}
......@@ -683,8 +683,8 @@ static void ircc_change_speed(void *priv, u32 speed)
/* No need to lock, already locked - Jean II */
irport_start(self->irport);
IRDA_DEBUG(0, __FUNCTION__
"(), using irport to change speed to %d\n", speed);
IRDA_DEBUG(0,
"%s(), using irport to change speed to %d\n", __FUNCTION__ , speed);
irport_change_speed(self->irport, speed);
}
......@@ -792,7 +792,7 @@ static void ircc_dma_xmit(struct ircc_cb *self, int iobase, int bofs)
{
u8 ctrl;
IRDA_DEBUG(2, __FUNCTION__ "\n");
IRDA_DEBUG(2, "%s\n", __FUNCTION__ );
#if 0
/* Disable Rx */
register_bank(iobase, 0);
......@@ -842,7 +842,7 @@ static void ircc_dma_xmit(struct ircc_cb *self, int iobase, int bofs)
*/
static void ircc_dma_xmit_complete(struct ircc_cb *self, int iobase)
{
IRDA_DEBUG(2, __FUNCTION__ "\n");
IRDA_DEBUG(2, "%s\n", __FUNCTION__ );
#if 0
/* Disable Tx */
register_bank(iobase, 0);
......@@ -928,7 +928,7 @@ static void ircc_dma_receive_complete(struct ircc_cb *self, int iobase)
struct sk_buff *skb;
int len, msgcnt;
IRDA_DEBUG(2, __FUNCTION__ "\n");
IRDA_DEBUG(2, "%s\n", __FUNCTION__ );
#if 0
/* Disable Rx */
register_bank(iobase, 0);
......@@ -937,7 +937,7 @@ static void ircc_dma_receive_complete(struct ircc_cb *self, int iobase)
register_bank(iobase, 0);
msgcnt = inb(iobase+IRCC_LCR_B) & 0x08;
IRDA_DEBUG(2, __FUNCTION__ ": dma count = %d\n",
IRDA_DEBUG(2, "%s: dma count = %d\n", __FUNCTION__ ,
get_dma_residue(self->io->dma));
len = self->rx_buff.truesize - get_dma_residue(self->io->dma);
......@@ -952,7 +952,7 @@ static void ircc_dma_receive_complete(struct ircc_cb *self, int iobase)
WARNING("%s(), bogus len=%d\n", __FUNCTION__, len);
return;
}
IRDA_DEBUG(2, __FUNCTION__ ": msgcnt = %d, len=%d\n", msgcnt, len);
IRDA_DEBUG(2, "%s: msgcnt = %d, len=%d\n", __FUNCTION__ , msgcnt, len);
skb = dev_alloc_skb(len+1);
if (!skb) {
......@@ -1012,7 +1012,7 @@ static void ircc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
/* Disable interrupts */
outb(0, iobase+IRCC_IER);
IRDA_DEBUG(2, __FUNCTION__ "(), iir = 0x%02x\n", iir);
IRDA_DEBUG(2, "%s(), iir = 0x%02x\n", __FUNCTION__ , iir);
if (iir & IRCC_IIR_EOM) {
if (self->io->direction == IO_RECV)
......@@ -1042,11 +1042,11 @@ static int ircc_is_receiving(struct ircc_cb *self)
int status = FALSE;
/* int iobase; */
IRDA_DEBUG(0, __FUNCTION__ "\n");
IRDA_DEBUG(0, "%s\n", __FUNCTION__ );
ASSERT(self != NULL, return FALSE;);
IRDA_DEBUG(0, __FUNCTION__ ": dma count = %d\n",
IRDA_DEBUG(0, "%s: dma count = %d\n", __FUNCTION__ ,
get_dma_residue(self->io->dma));
status = (self->rx_buff.state != OUTSIDE_FRAME);
......@@ -1067,7 +1067,7 @@ static int ircc_net_open(struct net_device *dev)
struct ircc_cb *self;
int iobase;
IRDA_DEBUG(0, __FUNCTION__ "\n");
IRDA_DEBUG(0, "%s\n", __FUNCTION__ );
ASSERT(dev != NULL, return -1;);
irport = (struct irport_cb *) dev->priv;
......@@ -1180,7 +1180,7 @@ static int __exit ircc_close(struct ircc_cb *self)
{
int iobase;
IRDA_DEBUG(0, __FUNCTION__ "\n");
IRDA_DEBUG(0, "%s\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
......@@ -1202,7 +1202,7 @@ static int __exit ircc_close(struct ircc_cb *self)
#endif
/* Release the PORT that this driver is using */
IRDA_DEBUG(0, __FUNCTION__ "(), releasing 0x%03x\n", iobase);
IRDA_DEBUG(0, "%s(), releasing 0x%03x\n", __FUNCTION__ , iobase);
release_region(iobase, CHIP_IO_EXTENT);
......@@ -1226,7 +1226,7 @@ void __exit smc_cleanup(void)
{
int i;
IRDA_DEBUG(0, __FUNCTION__ "\n");
IRDA_DEBUG(0, "%s\n", __FUNCTION__ );
for (i=0; i < 2; i++) {
if (dev_self[i])
......
drivers/net/irda/tekram.c
View file @ 887e8e0f
......@@ -66,7 +66,7 @@ void __exit tekram_cleanup(void)
static void tekram_open(dongle_t *self, struct qos_info *qos)
{
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
qos->min_turn_time.bits = 0x01; /* Needs at least 10 ms */
......@@ -77,7 +77,7 @@ static void tekram_open(dongle_t *self, struct qos_info *qos)
static void tekram_close(dongle_t *self)
{
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
/* Power off dongle */
self->set_dtr_rts(self->dev, FALSE, FALSE);
......@@ -113,12 +113,12 @@ static int tekram_change_speed(struct irda_task *task)
__u8 byte;
int ret = 0;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(task != NULL, return -1;);
if (self->speed_task && self->speed_task != task) {
IRDA_DEBUG(0, __FUNCTION__ "(), busy!\n");
IRDA_DEBUG(0, "%s(), busy!\n", __FUNCTION__ );
return MSECS_TO_JIFFIES(10);
} else
self->speed_task = task;
......@@ -214,12 +214,12 @@ int tekram_reset(struct irda_task *task)
dongle_t *self = (dongle_t *) task->instance;
int ret = 0;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(task != NULL, return -1;);
if (self->reset_task && self->reset_task != task) {
IRDA_DEBUG(0, __FUNCTION__ "(), busy!\n");
IRDA_DEBUG(0, "%s(), busy!\n", __FUNCTION__ );
return MSECS_TO_JIFFIES(10);
} else
self->reset_task = task;
......
drivers/net/irda/toshoboe.c
View file @ 887e8e0f
......@@ -92,7 +92,7 @@ static int max_baud = 4000000;
static void
toshoboe_stopchip (struct toshoboe_cb *self)
{
IRDA_DEBUG (4, __FUNCTION__ "()\n");
IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
outb_p (0x0e, OBOE_REG_11);
......@@ -113,7 +113,7 @@ static void
toshoboe_setbaud (struct toshoboe_cb *self, int baud)
{
unsigned long flags;
IRDA_DEBUG (4, __FUNCTION__ "()\n");
IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
printk (KERN_WARNING "ToshOboe: setting baud to %d\n", baud);
......@@ -183,7 +183,7 @@ toshoboe_startchip (struct toshoboe_cb *self)
{
__u32 physaddr;
IRDA_DEBUG (4, __FUNCTION__ "()\n");
IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
outb_p (0, OBOE_LOCK);
......@@ -212,7 +212,7 @@ toshoboe_startchip (struct toshoboe_cb *self)
static void
toshoboe_enablebm (struct toshoboe_cb *self)
{
IRDA_DEBUG (4, __FUNCTION__ "()\n");
IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
pci_set_master (self->pdev);
}
......@@ -221,7 +221,7 @@ static void
toshoboe_disablebm (struct toshoboe_cb *self)
{
__u8 command;
IRDA_DEBUG (4, __FUNCTION__ "()\n");
IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
pci_read_config_byte (self->pdev, PCI_COMMAND, &command);
command &= ~PCI_COMMAND_MASTER;
......@@ -236,7 +236,7 @@ toshoboe_initbuffs (struct toshoboe_cb *self)
int i;
unsigned long flags;
IRDA_DEBUG (4, __FUNCTION__ "()\n");
IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
save_flags (flags);
cli ();
......@@ -363,7 +363,7 @@ toshoboe_interrupt (int irq, void *dev_id, struct pt_regs *regs)
return;
}
IRDA_DEBUG (4, __FUNCTION__ "()\n");
IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
irqstat = inb_p (OBOE_ISR);
......@@ -463,7 +463,7 @@ toshoboe_interrupt (int irq, void *dev_id, struct pt_regs *regs)
static int
toshoboe_net_init (struct net_device *dev)
{
IRDA_DEBUG (4, __FUNCTION__ "()\n");
IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
/* Setup to be a normal IrDA network device driver */
irda_device_setup (dev);
......@@ -512,7 +512,7 @@ toshoboe_net_open (struct net_device *dev)
struct toshoboe_cb *self;
char hwname[32];
IRDA_DEBUG (4, __FUNCTION__ "()\n");
IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
ASSERT (dev != NULL, return -1;
);
......@@ -559,7 +559,7 @@ toshoboe_net_close (struct net_device *dev)
{
struct toshoboe_cb *self;
IRDA_DEBUG (4, __FUNCTION__ "()\n");
IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
ASSERT (dev != NULL, return -1;
);
......@@ -608,7 +608,7 @@ static int toshoboe_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
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);
......@@ -654,7 +654,7 @@ toshoboe_remove (struct pci_dev *pci_dev)
int i;
struct toshoboe_cb *self = (struct toshoboe_cb*)pci_get_drvdata(pci_dev);
IRDA_DEBUG (4, __FUNCTION__ "()\n");
IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
ASSERT (self != NULL, return;
);
......@@ -704,7 +704,7 @@ toshoboe_probe (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
int ok = 0;
int err;
IRDA_DEBUG (4, __FUNCTION__ "()\n");
IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
if ((err=pci_enable_device(pci_dev)))
return err;
......@@ -733,7 +733,7 @@ toshoboe_probe (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
/* Lock the port that we need */
if (NULL==request_region (self->io.sir_base, self->io.sir_ext, driver_name))
{
IRDA_DEBUG (0, __FUNCTION__ "(), can't get iobase of 0x%03x\n",
IRDA_DEBUG (0, "%s(), can't get iobase of 0x%03x\n", __FUNCTION__ ,
self->io.sir_base);
err = -EBUSY;
......
drivers/net/irda/w83977af_ir.c
View file @ 887e8e0f
......@@ -116,7 +116,7 @@ int __init w83977af_init(void)
{
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];
......@@ -138,7 +138,7 @@ void __exit w83977af_cleanup(void)
{
int i;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
for (i=0; i < 4; i++) {
if (dev_self[i])
......@@ -160,7 +160,7 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq,
void *ret;
int err;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
if (w83977af_probe(iobase, irq, dma) == -1)
return -1;
......@@ -190,8 +190,8 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq,
/* 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;
}
......@@ -273,7 +273,7 @@ static int w83977af_close(struct w83977af_ir *self)
{
int iobase;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
iobase = self->io.fir_base;
......@@ -297,8 +297,8 @@ static int w83977af_close(struct w83977af_ir *self)
}
/* 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)
......@@ -318,7 +318,7 @@ int w83977af_probe( int iobase, int irq, int dma)
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]);
......@@ -405,7 +405,7 @@ int w83977af_probe( int iobase, int irq, int dma)
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;
......@@ -441,19 +441,19 @@ void w83977af_change_speed(struct w83977af_ir *self, __u32 speed)
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;
}
......@@ -503,7 +503,7 @@ int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)
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 */
......@@ -550,7 +550,7 @@ int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)
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);
......@@ -591,7 +591,7 @@ static void w83977af_dma_write(struct w83977af_ir *self, int iobase)
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);
......@@ -643,19 +643,19 @@ static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size)
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 */
......@@ -664,8 +664,8 @@ static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size)
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);
......@@ -685,7 +685,7 @@ void w83977af_dma_xmit_complete(struct w83977af_ir *self)
int iobase;
__u8 set;
IRDA_DEBUG(4, __FUNCTION__ "(%ld)\n", jiffies);
IRDA_DEBUG(4, "%s(%ld)\n", __FUNCTION__ , jiffies);
ASSERT(self != NULL, return;);
......@@ -700,7 +700,7 @@ void w83977af_dma_xmit_complete(struct w83977af_ir *self)
/* 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++;
......@@ -741,7 +741,7 @@ int w83977af_dma_receive(struct w83977af_ir *self)
#endif
ASSERT(self != NULL, return -1;);
IRDA_DEBUG(4, __FUNCTION__ "\n");
IRDA_DEBUG(4, "%s\n", __FUNCTION__ );
iobase= self->io.fir_base;
......@@ -812,7 +812,7 @@ int w83977af_dma_receive_complete(struct w83977af_ir *self)
__u8 set;
__u8 status;
IRDA_DEBUG(4, __FUNCTION__ "\n");
IRDA_DEBUG(4, "%s\n", __FUNCTION__ );
st_fifo = &self->st_fifo;
......@@ -939,7 +939,7 @@ static void w83977af_pio_receive(struct w83977af_ir *self)
__u8 byte = 0x00;
int iobase;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
......@@ -966,7 +966,7 @@ static __u8 w83977af_sir_interrupt(struct w83977af_ir *self, int isr)
__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 */
......@@ -1002,8 +1002,8 @@ static __u8 w83977af_sir_interrupt(struct w83977af_ir *self, int isr)
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;
}
......@@ -1185,7 +1185,7 @@ static int w83977af_is_receiving(struct w83977af_ir *self)
*/
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);
......@@ -1209,7 +1209,7 @@ static int w83977af_net_open(struct net_device *dev)
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;
......@@ -1274,7 +1274,7 @@ static int w83977af_net_close(struct net_device *dev)
int iobase;
__u8 set;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
ASSERT(dev != NULL, return -1;);
......@@ -1331,7 +1331,7 @@ static int w83977af_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
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);
spin_lock_irqsave(&self->lock, flags);
......
net/irda/af_irda.c
View file @ 887e8e0f
This diff is collapsed.
net/irda/discovery.c
View file @ 887e8e0f
......@@ -108,7 +108,7 @@ void irlmp_add_discovery_log(hashbin_t *cachelog, hashbin_t *log)
{
discovery_t *discovery;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
/*
* If log is missing this means that IrLAP was unable to perform the
......@@ -150,7 +150,7 @@ void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force)
discovery_t *discovery, *curr;
unsigned long flags;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
spin_lock_irqsave(&log->hb_spinlock, flags);
......
net/irda/ircomm/ircomm_core.c
View file @ 887e8e0f
......@@ -78,7 +78,7 @@ int __init ircomm_init(void)
void __exit ircomm_cleanup(void)
{
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
hashbin_delete(ircomm, (FREE_FUNC) __ircomm_close);
......@@ -98,7 +98,7 @@ struct ircomm_cb *ircomm_open(notify_t *notify, __u8 service_type, int line)
struct ircomm_cb *self = NULL;
int ret;
IRDA_DEBUG(2, __FUNCTION__ "(), service_type=0x%02x\n",
IRDA_DEBUG(2, "%s(), service_type=0x%02x\n", __FUNCTION__ ,
service_type);
ASSERT(ircomm != NULL, return NULL;);
......@@ -142,7 +142,7 @@ EXPORT_SYMBOL(ircomm_open);
*/
static int __ircomm_close(struct ircomm_cb *self)
{
IRDA_DEBUG(2, __FUNCTION__"()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
/* Disconnect link if any */
ircomm_do_event(self, IRCOMM_DISCONNECT_REQUEST, NULL, NULL);
......@@ -178,7 +178,7 @@ int ircomm_close(struct ircomm_cb *self)
ASSERT(self != NULL, return -EIO;);
ASSERT(self->magic == IRCOMM_MAGIC, return -EIO;);
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
entry = hashbin_remove(ircomm, self->line, NULL);
......@@ -203,7 +203,7 @@ int ircomm_connect_request(struct ircomm_cb *self, __u8 dlsap_sel,
struct ircomm_info info;
int ret;
IRDA_DEBUG(2 , __FUNCTION__"()\n");
IRDA_DEBUG(2 , "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
......@@ -232,7 +232,7 @@ void ircomm_connect_indication(struct ircomm_cb *self, struct sk_buff *skb,
{
int clen = 0;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
/* Check if the packet contains data on the control channel */
if (skb->len > 0)
......@@ -248,7 +248,7 @@ void ircomm_connect_indication(struct ircomm_cb *self, struct sk_buff *skb,
info->qos, info->max_data_size,
info->max_header_size, skb);
else {
IRDA_DEBUG(0, __FUNCTION__ "(), missing handler\n");
IRDA_DEBUG(0, "%s(), missing handler\n", __FUNCTION__ );
dev_kfree_skb(skb);
}
}
......@@ -266,7 +266,7 @@ int ircomm_connect_response(struct ircomm_cb *self, struct sk_buff *userdata)
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ret = ircomm_do_event(self, IRCOMM_CONNECT_RESPONSE, userdata, NULL);
......@@ -284,7 +284,7 @@ EXPORT_SYMBOL(ircomm_connect_response);
void ircomm_connect_confirm(struct ircomm_cb *self, struct sk_buff *skb,
struct ircomm_info *info)
{
IRDA_DEBUG(4, __FUNCTION__"()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
if (self->notify.connect_confirm )
self->notify.connect_confirm(self->notify.instance,
......@@ -292,7 +292,7 @@ void ircomm_connect_confirm(struct ircomm_cb *self, struct sk_buff *skb,
info->max_data_size,
info->max_header_size, skb);
else {
IRDA_DEBUG(0, __FUNCTION__ "(), missing handler\n");
IRDA_DEBUG(0, "%s(), missing handler\n", __FUNCTION__ );
dev_kfree_skb(skb);
}
}
......@@ -307,7 +307,7 @@ int ircomm_data_request(struct ircomm_cb *self, struct sk_buff *skb)
{
int ret;
IRDA_DEBUG(4, __FUNCTION__"()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -EFAULT;);
ASSERT(self->magic == IRCOMM_MAGIC, return -EFAULT;);
......@@ -328,14 +328,14 @@ EXPORT_SYMBOL(ircomm_data_request);
*/
void ircomm_data_indication(struct ircomm_cb *self, struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__"()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(skb->len > 0, return;);
if (self->notify.data_indication)
self->notify.data_indication(self->notify.instance, self, skb);
else {
IRDA_DEBUG(0, __FUNCTION__ "(), missing handler\n");
IRDA_DEBUG(0, "%s(), missing handler\n", __FUNCTION__ );
dev_kfree_skb(skb);
}
}
......@@ -368,8 +368,8 @@ void ircomm_process_data(struct ircomm_cb *self, struct sk_buff *skb)
if (skb->len)
ircomm_data_indication(self, skb);
else {
IRDA_DEBUG(4, __FUNCTION__
"(), data was control info only!\n");
IRDA_DEBUG(4,
"%s(), data was control info only!\n", __FUNCTION__ );
dev_kfree_skb(skb);
}
}
......@@ -384,7 +384,7 @@ int ircomm_control_request(struct ircomm_cb *self, struct sk_buff *skb)
{
int ret;
IRDA_DEBUG(2, __FUNCTION__"()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -EFAULT;);
ASSERT(self->magic == IRCOMM_MAGIC, return -EFAULT;);
......@@ -408,7 +408,7 @@ static void ircomm_control_indication(struct ircomm_cb *self,
{
struct sk_buff *ctrl_skb;
IRDA_DEBUG(2, __FUNCTION__"()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ctrl_skb = skb_clone(skb, GFP_ATOMIC);
if (!ctrl_skb)
......@@ -422,7 +422,7 @@ static void ircomm_control_indication(struct ircomm_cb *self,
self->notify.udata_indication(self->notify.instance, self,
ctrl_skb);
else {
IRDA_DEBUG(0, __FUNCTION__ "(), missing handler\n");
IRDA_DEBUG(0, "%s(), missing handler\n", __FUNCTION__ );
dev_kfree_skb(skb);
}
}
......@@ -438,7 +438,7 @@ int ircomm_disconnect_request(struct ircomm_cb *self, struct sk_buff *userdata)
struct ircomm_info info;
int ret;
IRDA_DEBUG(2, __FUNCTION__"()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
......@@ -459,7 +459,7 @@ EXPORT_SYMBOL(ircomm_disconnect_request);
void ircomm_disconnect_indication(struct ircomm_cb *self, struct sk_buff *skb,
struct ircomm_info *info)
{
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(info != NULL, return;);
......@@ -467,7 +467,7 @@ void ircomm_disconnect_indication(struct ircomm_cb *self, struct sk_buff *skb,
self->notify.disconnect_indication(self->notify.instance, self,
info->reason, skb);
} else {
IRDA_DEBUG(0, __FUNCTION__ "(), missing handler\n");
IRDA_DEBUG(0, "%s(), missing handler\n", __FUNCTION__ );
dev_kfree_skb(skb);
}
}
......@@ -480,7 +480,7 @@ void ircomm_disconnect_indication(struct ircomm_cb *self, struct sk_buff *skb,
*/
void ircomm_flow_request(struct ircomm_cb *self, LOCAL_FLOW flow)
{
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;);
......
net/irda/ircomm/ircomm_event.c
View file @ 887e8e0f
......@@ -107,7 +107,7 @@ static int ircomm_state_idle(struct ircomm_cb *self, IRCOMM_EVENT event,
ircomm_connect_indication(self, skb, info);
break;
default:
IRDA_DEBUG(4, __FUNCTION__"(), unknown event: %s\n",
IRDA_DEBUG(4, "%s(), unknown event: %s\n", __FUNCTION__ ,
ircomm_event[event]);
if (skb)
dev_kfree_skb(skb);
......@@ -139,7 +139,7 @@ static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event,
ircomm_disconnect_indication(self, skb, info);
break;
default:
IRDA_DEBUG(0, __FUNCTION__"(), unknown event: %s\n",
IRDA_DEBUG(0, "%s(), unknown event: %s\n", __FUNCTION__ ,
ircomm_event[event]);
if (skb)
dev_kfree_skb(skb);
......@@ -174,7 +174,7 @@ static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event,
ircomm_disconnect_indication(self, skb, info);
break;
default:
IRDA_DEBUG(0, __FUNCTION__ "(), unknown event = %s\n",
IRDA_DEBUG(0, "%s(), unknown event = %s\n", __FUNCTION__ ,
ircomm_event[event]);
if (skb)
dev_kfree_skb(skb);
......@@ -218,7 +218,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event,
ret = self->issue.disconnect_request(self, skb, info);
break;
default:
IRDA_DEBUG(0, __FUNCTION__ "(), unknown event = %s\n",
IRDA_DEBUG(0, "%s(), unknown event = %s\n", __FUNCTION__ ,
ircomm_event[event]);
if (skb)
dev_kfree_skb(skb);
......@@ -236,7 +236,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event,
int ircomm_do_event(struct ircomm_cb *self, IRCOMM_EVENT event,
struct sk_buff *skb, struct ircomm_info *info)
{
IRDA_DEBUG(4, __FUNCTION__": state=%s, event=%s\n",
IRDA_DEBUG(4, "%s: state=%s, event=%s\n", __FUNCTION__ ,
ircomm_state[self->state], ircomm_event[event]);
return (*state[self->state])(self, event, skb, info);
......@@ -252,6 +252,6 @@ void ircomm_next_state(struct ircomm_cb *self, IRCOMM_STATE state)
{
self->state = state;
IRDA_DEBUG(4, __FUNCTION__": next state=%s, service type=%d\n",
IRDA_DEBUG(4, "%s: next state=%s, service type=%d\n", __FUNCTION__ ,
ircomm_state[self->state], self->service_type);
}
net/irda/ircomm/ircomm_lmp.c
View file @ 887e8e0f
......@@ -50,7 +50,7 @@ int ircomm_open_lsap(struct ircomm_cb *self)
{
notify_t notify;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
/* Register callbacks */
irda_notify_init(&notify);
......@@ -63,7 +63,7 @@ int ircomm_open_lsap(struct ircomm_cb *self)
self->lsap = irlmp_open_lsap(LSAP_ANY, &notify, 0);
if (!self->lsap) {
IRDA_DEBUG(0,__FUNCTION__"failed to allocate tsap\n");
IRDA_DEBUG(0,"%sfailed to allocate tsap\n", __FUNCTION__ );
return -1;
}
self->slsap_sel = self->lsap->slsap_sel;
......@@ -91,7 +91,7 @@ int ircomm_lmp_connect_request(struct ircomm_cb *self,
{
int ret = 0;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
ret = irlmp_connect_request(self->lsap, info->dlsap_sel,
info->saddr, info->daddr, NULL, userdata);
......@@ -109,7 +109,7 @@ int ircomm_lmp_connect_response(struct ircomm_cb *self, struct sk_buff *userdata
struct sk_buff *skb;
int ret;
IRDA_DEBUG(0, __FUNCTION__"()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
/* Any userdata supplied? */
if (userdata == NULL) {
......@@ -140,7 +140,7 @@ int ircomm_lmp_disconnect_request(struct ircomm_cb *self,
struct sk_buff *skb;
int ret;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
if (!userdata) {
skb = dev_alloc_skb(64);
......@@ -173,13 +173,13 @@ void ircomm_lmp_flow_control(struct sk_buff *skb)
cb = (struct irda_skb_cb *) skb->cb;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
line = cb->line;
self = (struct ircomm_cb *) hashbin_lock_find(ircomm, line, NULL);
if (!self) {
IRDA_DEBUG(2, __FUNCTION__ "(), didn't find myself\n");
IRDA_DEBUG(2, "%s(), didn't find myself\n", __FUNCTION__ );
return;
}
......@@ -189,7 +189,7 @@ void ircomm_lmp_flow_control(struct sk_buff *skb)
self->pkt_count--;
if ((self->pkt_count < 2) && (self->flow_status == FLOW_STOP)) {
IRDA_DEBUG(2, __FUNCTION__ "(), asking TTY to start again!\n");
IRDA_DEBUG(2, "%s(), asking TTY to start again!\n", __FUNCTION__ );
self->flow_status = FLOW_START;
if (self->notify.flow_indication)
self->notify.flow_indication(self->notify.instance,
......@@ -215,12 +215,12 @@ int ircomm_lmp_data_request(struct ircomm_cb *self, struct sk_buff *skb,
cb->line = self->line;
IRDA_DEBUG(4, __FUNCTION__"(), sending frame\n");
IRDA_DEBUG(4, "%s(), sending frame\n", __FUNCTION__ );
skb->destructor = ircomm_lmp_flow_control;
if ((self->pkt_count++ > 7) && (self->flow_status == FLOW_START)) {
IRDA_DEBUG(2, __FUNCTION__ "(), asking TTY to slow down!\n");
IRDA_DEBUG(2, "%s(), asking TTY to slow down!\n", __FUNCTION__ );
self->flow_status = FLOW_STOP;
if (self->notify.flow_indication)
self->notify.flow_indication(self->notify.instance,
......@@ -246,7 +246,7 @@ int ircomm_lmp_data_indication(void *instance, void *sap,
{
struct ircomm_cb *self = (struct ircomm_cb *) instance;
IRDA_DEBUG(4, __FUNCTION__"()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
......@@ -273,7 +273,7 @@ void ircomm_lmp_connect_confirm(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *) instance;
struct ircomm_info info;
IRDA_DEBUG(0, __FUNCTION__"()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;);
......@@ -303,7 +303,7 @@ void ircomm_lmp_connect_indication(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *)instance;
struct ircomm_info info;
IRDA_DEBUG(0, __FUNCTION__"()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;);
......@@ -330,7 +330,7 @@ void ircomm_lmp_disconnect_indication(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *) instance;
struct ircomm_info info;
IRDA_DEBUG(0, __FUNCTION__"()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;);
......
net/irda/ircomm/ircomm_param.c
View file @ 887e8e0f
......@@ -121,7 +121,7 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush)
struct sk_buff *skb;
int count;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
......@@ -162,7 +162,7 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush)
spin_unlock_irqrestore(&self->spinlock, flags);
IRDA_DEBUG(2, __FUNCTION__ "(), skb->len=%d\n", skb->len);
IRDA_DEBUG(2, "%s(), skb->len=%d\n", __FUNCTION__ , skb->len);
if (flush) {
/* ircomm_tty_do_softint will take care of the rest */
......@@ -197,11 +197,11 @@ static int ircomm_param_service_type(void *instance, irda_param_t *param,
/* Find all common service types */
service_type &= self->service_type;
if (!service_type) {
IRDA_DEBUG(2, __FUNCTION__
"(), No common service type to use!\n");
IRDA_DEBUG(2,
"%s(), No common service type to use!\n", __FUNCTION__ );
return -1;
}
IRDA_DEBUG(0, __FUNCTION__ "(), services in common=%02x\n",
IRDA_DEBUG(0, "%s(), services in common=%02x\n", __FUNCTION__ ,
service_type);
/*
......@@ -216,7 +216,7 @@ static int ircomm_param_service_type(void *instance, irda_param_t *param,
else if (service_type & IRCOMM_3_WIRE_RAW)
self->settings.service_type = IRCOMM_3_WIRE_RAW;
IRDA_DEBUG(0, __FUNCTION__ "(), resulting service type=0x%02x\n",
IRDA_DEBUG(0, "%s(), resulting service type=0x%02x\n", __FUNCTION__ ,
self->settings.service_type);
/*
......@@ -252,7 +252,7 @@ static int ircomm_param_port_type(void *instance, irda_param_t *param, int get)
else {
self->settings.port_type = (__u8) param->pv.i;
IRDA_DEBUG(0, __FUNCTION__ "(), port type=%d\n",
IRDA_DEBUG(0, "%s(), port type=%d\n", __FUNCTION__ ,
self->settings.port_type);
}
return 0;
......@@ -272,9 +272,9 @@ static int ircomm_param_port_name(void *instance, irda_param_t *param, int get)
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
if (get) {
IRDA_DEBUG(0, __FUNCTION__ "(), not imp!\n");
IRDA_DEBUG(0, "%s(), not imp!\n", __FUNCTION__ );
} else {
IRDA_DEBUG(0, __FUNCTION__ "(), port-name=%s\n", param->pv.c);
IRDA_DEBUG(0, "%s(), port-name=%s\n", __FUNCTION__ , param->pv.c);
strncpy(self->settings.port_name, param->pv.c, 32);
}
......@@ -299,7 +299,7 @@ static int ircomm_param_data_rate(void *instance, irda_param_t *param, int get)
else
self->settings.data_rate = param->pv.i;
IRDA_DEBUG(2, __FUNCTION__ "(), data rate = %d\n", param->pv.i);
IRDA_DEBUG(2, "%s(), data rate = %d\n", __FUNCTION__ , param->pv.i);
return 0;
}
......@@ -345,7 +345,7 @@ static int ircomm_param_flow_control(void *instance, irda_param_t *param,
else
self->settings.flow_control = (__u8) param->pv.i;
IRDA_DEBUG(1, __FUNCTION__ "(), flow control = 0x%02x\n", (__u8) param->pv.i);
IRDA_DEBUG(1, "%s(), flow control = 0x%02x\n", __FUNCTION__ , (__u8) param->pv.i);
return 0;
}
......@@ -371,7 +371,7 @@ static int ircomm_param_xon_xoff(void *instance, irda_param_t *param, int get)
self->settings.xonxoff[1] = (__u16) param->pv.i >> 8;
}
IRDA_DEBUG(0, __FUNCTION__ "(), XON/XOFF = 0x%02x,0x%02x\n",
IRDA_DEBUG(0, "%s(), XON/XOFF = 0x%02x,0x%02x\n", __FUNCTION__ ,
param->pv.i & 0xff, param->pv.i >> 8);
return 0;
......@@ -398,7 +398,7 @@ static int ircomm_param_enq_ack(void *instance, irda_param_t *param, int get)
self->settings.enqack[1] = (__u16) param->pv.i >> 8;
}
IRDA_DEBUG(0, __FUNCTION__ "(), ENQ/ACK = 0x%02x,0x%02x\n",
IRDA_DEBUG(0, "%s(), ENQ/ACK = 0x%02x,0x%02x\n", __FUNCTION__ ,
param->pv.i & 0xff, param->pv.i >> 8);
return 0;
......@@ -413,7 +413,7 @@ static int ircomm_param_enq_ack(void *instance, irda_param_t *param, int get)
static int ircomm_param_line_status(void *instance, irda_param_t *param,
int get)
{
IRDA_DEBUG(2, __FUNCTION__ "(), not impl.\n");
IRDA_DEBUG(2, "%s(), not impl.\n", __FUNCTION__ );
return 0;
}
......@@ -472,7 +472,7 @@ static int ircomm_param_dce(void *instance, irda_param_t *param, int get)
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
__u8 dce;
IRDA_DEBUG(1, __FUNCTION__ "(), dce = 0x%02x\n", (__u8) param->pv.i);
IRDA_DEBUG(1, "%s(), dce = 0x%02x\n", __FUNCTION__ , (__u8) param->pv.i);
dce = (__u8) param->pv.i;
......@@ -484,7 +484,7 @@ static int ircomm_param_dce(void *instance, irda_param_t *param, int get)
/* Check if any of the settings have changed */
if (dce & 0x0f) {
if (dce & IRCOMM_DELTA_CTS) {
IRDA_DEBUG(2, __FUNCTION__ "(), CTS \n");
IRDA_DEBUG(2, "%s(), CTS \n", __FUNCTION__ );
}
}
......
net/irda/ircomm/ircomm_ttp.c
View file @ 887e8e0f
......@@ -49,7 +49,7 @@ int ircomm_open_tsap(struct ircomm_cb *self)
{
notify_t notify;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
/* Register callbacks */
irda_notify_init(&notify);
......@@ -64,7 +64,7 @@ int ircomm_open_tsap(struct ircomm_cb *self)
self->tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT,
&notify);
if (!self->tsap) {
IRDA_DEBUG(0, __FUNCTION__"failed to allocate tsap\n");
IRDA_DEBUG(0, "%sfailed to allocate tsap\n", __FUNCTION__ );
return -1;
}
self->slsap_sel = self->tsap->stsap_sel;
......@@ -92,7 +92,7 @@ int ircomm_ttp_connect_request(struct ircomm_cb *self,
{
int ret = 0;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ret = irttp_connect_request(self->tsap, info->dlsap_sel,
info->saddr, info->daddr, NULL,
......@@ -110,7 +110,7 @@ int ircomm_ttp_connect_response(struct ircomm_cb *self, struct sk_buff *skb)
{
int ret;
IRDA_DEBUG(4, __FUNCTION__"()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ret = irttp_connect_response(self->tsap, TTP_SAR_DISABLE, skb);
......@@ -133,7 +133,7 @@ int ircomm_ttp_data_request(struct ircomm_cb *self, struct sk_buff *skb,
ASSERT(skb != NULL, return -1;);
IRDA_DEBUG(2, __FUNCTION__"(), clen=%d\n", clen);
IRDA_DEBUG(2, "%s(), clen=%d\n", __FUNCTION__ , clen);
/*
* Insert clen field, currently we either send data only, or control
......@@ -164,7 +164,7 @@ int ircomm_ttp_data_indication(void *instance, void *sap,
{
struct ircomm_cb *self = (struct ircomm_cb *) instance;
IRDA_DEBUG(4, __FUNCTION__"()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
......@@ -184,7 +184,7 @@ void ircomm_ttp_connect_confirm(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *) instance;
struct ircomm_info info;
IRDA_DEBUG(4, __FUNCTION__"()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;);
......@@ -221,7 +221,7 @@ void ircomm_ttp_connect_indication(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *)instance;
struct ircomm_info info;
IRDA_DEBUG(4, __FUNCTION__"()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;);
......@@ -272,7 +272,7 @@ void ircomm_ttp_disconnect_indication(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *) instance;
struct ircomm_info info;
IRDA_DEBUG(2, __FUNCTION__"()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;);
......@@ -292,7 +292,7 @@ void ircomm_ttp_flow_indication(void *instance, void *sap, LOCAL_FLOW cmd)
{
struct ircomm_cb *self = (struct ircomm_cb *) instance;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;);
......
net/irda/ircomm/ircomm_tty.c
View file @ 887e8e0f
This diff is collapsed.
net/irda/ircomm/ircomm_tty_attach.c
View file @ 887e8e0f
This diff is collapsed.
net/irda/ircomm/ircomm_tty_ioctl.c
View file @ 887e8e0f
......@@ -58,7 +58,7 @@ void ircomm_tty_change_speed(struct ircomm_tty_cb *self)
unsigned cflag, cval;
int baud;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
if (!self->tty || !self->tty->termios || !self->ircomm)
return;
......@@ -151,7 +151,7 @@ void ircomm_tty_set_termios(struct tty_struct *tty,
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
unsigned int cflag = tty->termios->c_cflag;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
if ((cflag == old_termios->c_cflag) &&
(RELEVANT_IFLAG(tty->termios->c_iflag) ==
......@@ -200,7 +200,7 @@ static int ircomm_tty_get_modem_info(struct ircomm_tty_cb *self,
{
unsigned int result;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
result = ((self->settings.dte & IRCOMM_RTS) ? TIOCM_RTS : 0)
| ((self->settings.dte & IRCOMM_DTR) ? TIOCM_DTR : 0)
......@@ -224,7 +224,7 @@ static int ircomm_tty_set_modem_info(struct ircomm_tty_cb *self,
unsigned int arg;
__u8 old_rts, old_dtr;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
......@@ -286,7 +286,7 @@ static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self,
if (!retinfo)
return -EFAULT;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
memset(&info, 0, sizeof(info));
info.line = self->line;
......@@ -322,7 +322,7 @@ static int ircomm_tty_set_serial_info(struct ircomm_tty_cb *self,
struct serial_struct new_serial;
struct ircomm_tty_cb old_state, *state;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
if (copy_from_user(&new_serial,new_info,sizeof(new_serial)))
return -EFAULT;
......@@ -396,7 +396,7 @@ int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file,
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
int ret = 0;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
(cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) &&
......@@ -425,7 +425,7 @@ int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file,
break;
case TIOCGICOUNT:
IRDA_DEBUG(0, __FUNCTION__ "(), TIOCGICOUNT not impl!\n");
IRDA_DEBUG(0, "%s(), TIOCGICOUNT not impl!\n", __FUNCTION__ );
#if 0
save_flags(flags); cli();
cnow = driver->icount;
......
net/irda/irda_device.c
View file @ 887e8e0f
......@@ -111,7 +111,7 @@ int __init irda_device_init( void)
void __exit irda_device_cleanup(void)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
hashbin_delete(tasks, (FREE_FUNC) __irda_task_delete);
hashbin_delete(dongles, NULL);
......@@ -127,7 +127,7 @@ void irda_device_set_media_busy(struct net_device *dev, int status)
{
struct irlap_cb *self;
IRDA_DEBUG(4, __FUNCTION__ "(%s)\n", status ? "TRUE" : "FALSE");
IRDA_DEBUG(4, "%s(%s)\n", __FUNCTION__, status ? "TRUE" : "FALSE");
self = (struct irlap_cb *) dev->atalk_ptr;
......@@ -152,7 +152,7 @@ int irda_device_set_dtr_rts(struct net_device *dev, int dtr, int rts)
struct if_irda_req req;
int ret;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
if (!dev->do_ioctl) {
ERROR("%s: do_ioctl not impl. by device driver\n",
......@@ -173,7 +173,7 @@ int irda_device_change_speed(struct net_device *dev, __u32 speed)
struct if_irda_req req;
int ret;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
if (!dev->do_ioctl) {
ERROR("%s: do_ioctl not impl. by device driver\n",
......@@ -199,7 +199,7 @@ int irda_device_is_receiving(struct net_device *dev)
struct if_irda_req req;
int ret;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
if (!dev->do_ioctl) {
ERROR("%s: do_ioctl not impl. by device driver\n",
......@@ -216,7 +216,7 @@ int irda_device_is_receiving(struct net_device *dev)
void irda_task_next_state(struct irda_task *task, IRDA_TASK_STATE state)
{
IRDA_DEBUG(2, __FUNCTION__ "(), state = %s\n", task_state[state]);
IRDA_DEBUG(2, "%s(), state = %s\n", __FUNCTION__, task_state[state]);
task->state = state;
}
......@@ -250,7 +250,7 @@ int irda_task_kick(struct irda_task *task)
int count = 0;
int timeout;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
ASSERT(task != NULL, return -1;);
ASSERT(task->magic == IRDA_TASK_MAGIC, return -1;);
......@@ -298,8 +298,8 @@ int irda_task_kick(struct irda_task *task)
irda_task_timer_expired);
finished = FALSE;
} else {
IRDA_DEBUG(0, __FUNCTION__
"(), not finished, and no timeout!\n");
IRDA_DEBUG(0, "%s(), not finished, and no timeout!\n",
__FUNCTION__);
finished = FALSE;
}
......@@ -328,7 +328,7 @@ struct irda_task *irda_task_execute(void *instance,
struct irda_task *task;
int ret;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
task = kmalloc(sizeof(struct irda_task), GFP_ATOMIC);
if (!task)
......@@ -365,7 +365,7 @@ static void irda_task_timer_expired(void *data)
{
struct irda_task *task;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
task = (struct irda_task *) data;
......@@ -517,7 +517,7 @@ int irda_device_set_mode(struct net_device* dev, int mode)
struct if_irda_req req;
int ret;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__);
if (!dev->do_ioctl) {
ERROR("%s: set_raw_mode not impl. by device driver\n",
......
net/irda/iriap.c
View file @ 887e8e0f
This diff is collapsed.
net/irda/iriap_event.c
View file @ 887e8e0f
......@@ -181,7 +181,7 @@ static void state_s_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
case IAP_LM_DISCONNECT_INDICATION:
break;
default:
IRDA_DEBUG(0, __FUNCTION__"(), Unknown event %d\n", event);
IRDA_DEBUG(0, "%s(), Unknown event %d\n", __FUNCTION__, event);
break;
}
}
......@@ -213,7 +213,7 @@ static void state_s_connecting(struct iriap_cb *self, IRIAP_EVENT event,
iriap_next_client_state(self, S_DISCONNECT);
break;
default:
IRDA_DEBUG(0, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG(0, "%s(), Unknown event %d\n", __FUNCTION__, event);
break;
}
}
......@@ -262,7 +262,7 @@ static void state_s_make_call(struct iriap_cb *self, IRIAP_EVENT event,
iriap_next_call_state(self, S_OUTSTANDING);
break;
default:
IRDA_DEBUG(0, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG(0, "%s(), Unknown event %d\n", __FUNCTION__, event);
if (skb)
dev_kfree_skb(skb);
break;
......@@ -278,7 +278,7 @@ static void state_s_make_call(struct iriap_cb *self, IRIAP_EVENT event,
static void state_s_calling(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(0, __FUNCTION__ "(), Not implemented\n");
IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
}
/*
......@@ -300,7 +300,7 @@ static void state_s_outstanding(struct iriap_cb *self, IRIAP_EVENT event,
iriap_next_call_state(self, S_WAIT_FOR_CALL);
break;
default:
IRDA_DEBUG(0, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG(0, "%s(), Unknown event %d\n", __FUNCTION__, event);
break;
}
}
......@@ -313,7 +313,7 @@ static void state_s_outstanding(struct iriap_cb *self, IRIAP_EVENT event,
static void state_s_replying(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(0, __FUNCTION__ "(), Not implemented\n");
IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
}
/*
......@@ -325,7 +325,7 @@ static void state_s_replying(struct iriap_cb *self, IRIAP_EVENT event,
static void state_s_wait_for_call(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(0, __FUNCTION__ "(), Not implemented\n");
IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
}
......@@ -338,7 +338,7 @@ static void state_s_wait_for_call(struct iriap_cb *self, IRIAP_EVENT event,
static void state_s_wait_active(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(0, __FUNCTION__ "(), Not implemented\n");
IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
}
/**************************************************************************
......@@ -385,7 +385,7 @@ static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
break;
default:
IRDA_DEBUG(0, __FUNCTION__ "(), unknown event %d\n", event);
IRDA_DEBUG(0, "%s(), unknown event %d\n", __FUNCTION__, event);
break;
}
}
......@@ -396,7 +396,7 @@ static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
switch (event) {
case IAP_LM_DISCONNECT_INDICATION:
......@@ -405,7 +405,7 @@ static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event,
iriap_next_r_connect_state(self, R_WAITING);
break;
default:
IRDA_DEBUG(0, __FUNCTION__ "(), unknown event!\n");
IRDA_DEBUG(0, "%s(), unknown event!\n", __FUNCTION__);
break;
}
}
......@@ -420,13 +420,13 @@ static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event,
static void state_r_waiting(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(0, __FUNCTION__ "(), Not implemented\n");
IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
}
static void state_r_wait_active(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(0, __FUNCTION__ "(), Not implemented\n");
IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
}
/*
......@@ -438,7 +438,7 @@ static void state_r_wait_active(struct iriap_cb *self, IRIAP_EVENT event,
static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
switch (event) {
case IAP_RECV_F_LST:
......@@ -447,7 +447,7 @@ static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event,
iriap_call_indication(self, skb);
break;
default:
IRDA_DEBUG(0, __FUNCTION__ "(), unknown event!\n");
IRDA_DEBUG(0, "%s(), unknown event!\n", __FUNCTION__);
break;
}
......@@ -462,12 +462,12 @@ static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event,
static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(skb != NULL, return;);
if (!self || self->magic != IAS_MAGIC) {
IRDA_DEBUG(0, __FUNCTION__ "(), bad pointer self\n");
IRDA_DEBUG(0, "%s(), bad pointer self\n", __FUNCTION__);
return;
}
......@@ -482,7 +482,7 @@ static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event,
irlmp_data_request(self->lsap, skb);
break;
default:
IRDA_DEBUG(0, __FUNCTION__ "(), unknown event!\n");
IRDA_DEBUG(0, "%s(), unknown event!\n", __FUNCTION__);
break;
}
}
......@@ -490,7 +490,7 @@ static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event,
static void state_r_returning(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(0, __FUNCTION__ "(), event=%d\n", event);
IRDA_DEBUG(0, "%s(), event=%d\n", __FUNCTION__, event);
switch (event) {
case IAP_RECV_F_LST:
......
net/irda/irias_object.c
View file @ 887e8e0f
......@@ -79,12 +79,13 @@ struct ias_object *irias_new_object( char *name, int id)
{
struct ias_object *obj;
IRDA_DEBUG( 4, __FUNCTION__ "()\n");
IRDA_DEBUG( 4, "%s()\n", __FUNCTION__);
obj = (struct ias_object *) kmalloc(sizeof(struct ias_object),
GFP_ATOMIC);
if (obj == NULL) {
IRDA_DEBUG(0, __FUNCTION__ "(), Unable to allocate object!\n");
IRDA_DEBUG(0, "%s(), Unable to allocate object!\n",
__FUNCTION__);
return NULL;
}
memset(obj, 0, sizeof( struct ias_object));
......@@ -295,8 +296,8 @@ int irias_object_change_attribute(char *obj_name, char *attrib_name,
}
if ( attrib->value->type != new_value->type) {
IRDA_DEBUG( 0, __FUNCTION__
"(), changing value type not allowed!\n");
IRDA_DEBUG( 0, "%s(), changing value type not allowed!\n",
__FUNCTION__);
spin_unlock_irqrestore(&obj->attribs->hb_spinlock, flags);
return -1;
}
......@@ -521,7 +522,7 @@ struct ias_value *irias_new_missing_value(void)
*/
void irias_delete_value(struct ias_value *value)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(value != NULL, return;);
......@@ -541,7 +542,7 @@ void irias_delete_value(struct ias_value *value)
kfree(value->t.oct_seq);
break;
default:
IRDA_DEBUG(0, __FUNCTION__ "(), Unknown value type!\n");
IRDA_DEBUG(0, "%s(), Unknown value type!\n", __FUNCTION__);
break;
}
kfree(value);
......
net/irda/irlan/irlan_client.c
View file @ 887e8e0f
......@@ -71,7 +71,7 @@ static void irlan_client_kick_timer_expired(void *data)
{
struct irlan_cb *self = (struct irlan_cb *) data;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -90,7 +90,7 @@ static void irlan_client_kick_timer_expired(void *data)
void irlan_client_start_kick_timer(struct irlan_cb *self, int timeout)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
irda_start_timer(&self->client.kick_timer, timeout, (void *) self,
irlan_client_kick_timer_expired);
......@@ -104,7 +104,7 @@ void irlan_client_start_kick_timer(struct irlan_cb *self, int timeout)
*/
void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr)
{
IRDA_DEBUG(1, __FUNCTION__ "()\n");
IRDA_DEBUG(1, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -116,7 +116,7 @@ void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr)
if ((self->client.state != IRLAN_IDLE) ||
(self->provider.access_type == ACCESS_DIRECT))
{
IRDA_DEBUG(0, __FUNCTION__ "(), already awake!\n");
IRDA_DEBUG(0, "%s(), already awake!\n", __FUNCTION__ );
return;
}
......@@ -125,7 +125,7 @@ void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr)
self->daddr = daddr;
if (self->disconnect_reason == LM_USER_REQUEST) {
IRDA_DEBUG(0, __FUNCTION__ "(), still stopped by user\n");
IRDA_DEBUG(0, "%s(), still stopped by user\n", __FUNCTION__ );
return;
}
......@@ -152,7 +152,7 @@ void irlan_client_discovery_indication(discovery_t *discovery,
struct irlan_cb *self;
__u32 saddr, daddr;
IRDA_DEBUG(1, __FUNCTION__"()\n");
IRDA_DEBUG(1, "%s()\n", __FUNCTION__ );
ASSERT(irlan != NULL, return;);
ASSERT(discovery != NULL, return;);
......@@ -174,7 +174,7 @@ void irlan_client_discovery_indication(discovery_t *discovery,
if (self) {
ASSERT(self->magic == IRLAN_MAGIC, return;);
IRDA_DEBUG(1, __FUNCTION__ "(), Found instance (%08x)!\n",
IRDA_DEBUG(1, "%s(), Found instance (%08x)!\n", __FUNCTION__ ,
daddr);
irlan_client_wakeup(self, saddr, daddr);
......@@ -192,7 +192,7 @@ static int irlan_client_ctrl_data_indication(void *instance, void *sap,
{
struct irlan_cb *self;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
self = (struct irlan_cb *) instance;
......@@ -203,7 +203,7 @@ static int irlan_client_ctrl_data_indication(void *instance, void *sap,
irlan_do_client_event(self, IRLAN_DATA_INDICATION, skb);
/* Ready for a new command */
IRDA_DEBUG(2, __FUNCTION__ "(), clearing tx_busy\n");
IRDA_DEBUG(2, "%s(), clearing tx_busy\n", __FUNCTION__ );
self->client.tx_busy = FALSE;
/* Check if we have some queued commands waiting to be sent */
......@@ -220,7 +220,7 @@ static void irlan_client_ctrl_disconnect_indication(void *instance, void *sap,
struct tsap_cb *tsap;
struct sk_buff *skb;
IRDA_DEBUG(4, __FUNCTION__ "(), reason=%d\n", reason);
IRDA_DEBUG(4, "%s(), reason=%d\n", __FUNCTION__ , reason);
self = (struct irlan_cb *) instance;
tsap = (struct tsap_cb *) sap;
......@@ -252,7 +252,7 @@ void irlan_client_open_ctrl_tsap(struct irlan_cb *self)
struct tsap_cb *tsap;
notify_t notify;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -272,7 +272,7 @@ void irlan_client_open_ctrl_tsap(struct irlan_cb *self)
tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, &notify);
if (!tsap) {
IRDA_DEBUG(2, __FUNCTION__ "(), Got no tsap!\n");
IRDA_DEBUG(2, "%s(), Got no tsap!\n", __FUNCTION__ );
return;
}
self->client.tsap_ctrl = tsap;
......@@ -292,7 +292,7 @@ static void irlan_client_ctrl_connect_confirm(void *instance, void *sap,
{
struct irlan_cb *self;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
self = (struct irlan_cb *) instance;
......@@ -318,7 +318,7 @@ void irlan_client_reconnect_data_channel(struct irlan_cb *self)
struct sk_buff *skb;
__u8 *frame;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -361,7 +361,7 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb)
ASSERT(skb != NULL, return;);
IRDA_DEBUG(4, __FUNCTION__ "() skb->len=%d\n", (int) skb->len);
IRDA_DEBUG(4, "%s() skb->len=%d\n", __FUNCTION__ , (int) skb->len);
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -392,7 +392,7 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb)
/* How many parameters? */
count = frame[1];
IRDA_DEBUG(4, __FUNCTION__ "(), got %d parameters\n", count);
IRDA_DEBUG(4, "%s(), got %d parameters\n", __FUNCTION__ , count);
ptr = frame+2;
......@@ -400,7 +400,7 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb)
for (i=0; i<count;i++) {
ret = irlan_extract_param(ptr, name, value, &val_len);
if (ret < 0) {
IRDA_DEBUG(2, __FUNCTION__ "(), IrLAN, Error!\n");
IRDA_DEBUG(2, "%s(), IrLAN, Error!\n", __FUNCTION__ );
break;
}
ptr += ret;
......@@ -424,7 +424,7 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
__u8 *bytes;
int i;
IRDA_DEBUG(4, __FUNCTION__ "(), parm=%s\n", param);
IRDA_DEBUG(4, "%s(), parm=%s\n", __FUNCTION__ , param);
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -462,7 +462,7 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
else if (strcmp(value, "HOSTED") == 0)
self->client.access_type = ACCESS_HOSTED;
else {
IRDA_DEBUG(2, __FUNCTION__ "(), unknown access type!\n");
IRDA_DEBUG(2, "%s(), unknown access type!\n", __FUNCTION__ );
}
}
/* IRLAN version */
......@@ -484,14 +484,14 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
memcpy(&tmp_cpu, value, 2); /* Align value */
le16_to_cpus(&tmp_cpu); /* Convert to host order */
self->client.recv_arb_val = tmp_cpu;
IRDA_DEBUG(2, __FUNCTION__ "(), receive arb val=%d\n",
IRDA_DEBUG(2, "%s(), receive arb val=%d\n", __FUNCTION__ ,
self->client.recv_arb_val);
}
if (strcmp(param, "MAX_FRAME") == 0) {
memcpy(&tmp_cpu, value, 2); /* Align value */
le16_to_cpus(&tmp_cpu); /* Convert to host order */
self->client.max_frame = tmp_cpu;
IRDA_DEBUG(4, __FUNCTION__ "(), max frame=%d\n",
IRDA_DEBUG(4, "%s(), max frame=%d\n", __FUNCTION__ ,
self->client.max_frame);
}
......@@ -526,7 +526,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
{
struct irlan_cb *self;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(priv != NULL, return;);
......@@ -539,7 +539,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
/* Check if request succeeded */
if (result != IAS_SUCCESS) {
IRDA_DEBUG(2, __FUNCTION__ "(), got NULL value!\n");
IRDA_DEBUG(2, "%s(), got NULL value!\n", __FUNCTION__ );
irlan_do_client_event(self, IRLAN_IAS_PROVIDER_NOT_AVAIL,
NULL);
return;
......@@ -557,7 +557,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
irias_delete_value(value);
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), unknown type!\n");
IRDA_DEBUG(2, "%s(), unknown type!\n", __FUNCTION__ );
break;
}
irlan_do_client_event(self, IRLAN_IAS_PROVIDER_NOT_AVAIL, NULL);
......
net/irda/irlan/irlan_client_event.c
View file @ 887e8e0f
......@@ -92,7 +92,7 @@ void irlan_do_client_event(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRLAN_MAGIC, return -1;);
......@@ -113,10 +113,10 @@ static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
"IrLAN", "IrDA:TinyTP:LsapSel");
break;
case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break;
default:
IRDA_DEBUG(4, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG(4, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break;
}
if (skb)
......@@ -135,7 +135,7 @@ static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRLAN_MAGIC, return -1;);
......@@ -153,7 +153,7 @@ static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_CONN);
break;
case IRLAN_IAS_PROVIDER_NOT_AVAIL:
IRDA_DEBUG(2, __FUNCTION__ "(), IAS_PROVIDER_NOT_AVAIL\n");
IRDA_DEBUG(2, "%s(), IAS_PROVIDER_NOT_AVAIL\n", __FUNCTION__ );
irlan_next_client_state(self, IRLAN_IDLE);
/* Give the client a kick! */
......@@ -166,10 +166,10 @@ static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE);
break;
case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break;
default:
IRDA_DEBUG(2, __FUNCTION__"(), Unknown event %d\n", event);
IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break;
}
if (skb)
......@@ -188,7 +188,7 @@ static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_conn(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
......@@ -203,10 +203,10 @@ static int irlan_client_state_conn(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE);
break;
case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break;
}
if (skb)
......@@ -223,7 +223,7 @@ static int irlan_client_state_conn(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_info(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
......@@ -243,10 +243,10 @@ static int irlan_client_state_info(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE);
break;
case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break;
}
if (skb)
......@@ -265,7 +265,7 @@ static int irlan_client_state_info(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_media(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
......@@ -280,10 +280,10 @@ static int irlan_client_state_media(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE);
break;
case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break;
}
if (skb)
......@@ -304,7 +304,7 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event,
{
struct qos_info qos;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
......@@ -343,7 +343,7 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_DATA);
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), unknown access type!\n");
IRDA_DEBUG(2, "%s(), unknown access type!\n", __FUNCTION__ );
break;
}
break;
......@@ -352,10 +352,10 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE);
break;
case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break;
}
......@@ -375,7 +375,7 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_wait(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
......@@ -389,10 +389,10 @@ static int irlan_client_state_wait(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE);
break;
case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break;
}
if (skb)
......@@ -406,7 +406,7 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event,
{
struct qos_info qos;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
......@@ -428,7 +428,7 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event,
} else if (self->client.recv_arb_val >
self->provider.send_arb_val)
{
IRDA_DEBUG(2, __FUNCTION__ "(), lost the battle :-(\n");
IRDA_DEBUG(2, "%s(), lost the battle :-(\n", __FUNCTION__ );
}
break;
case IRLAN_DATA_CONNECT_INDICATION:
......@@ -439,10 +439,10 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE);
break;
case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break;
}
if (skb)
......@@ -461,7 +461,7 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_data(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRLAN_MAGIC, return -1;);
......@@ -475,7 +475,7 @@ static int irlan_client_state_data(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE);
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break;
}
if (skb)
......@@ -493,7 +493,7 @@ static int irlan_client_state_data(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_close(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
if (skb)
dev_kfree_skb(skb);
......@@ -510,7 +510,7 @@ static int irlan_client_state_close(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_sync(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
if (skb)
dev_kfree_skb(skb);
......
net/irda/irlan/irlan_common.c
View file @ 887e8e0f
......@@ -64,7 +64,8 @@
* Master structure
*/
hashbin_t *irlan = NULL;
static __u32 ckey, skey;
static void *ckey;
static void *skey;
/* Module parameters */
static int eth = 0; /* Use "eth" or "irlan" name for devices */
......@@ -122,7 +123,7 @@ int __init irlan_init(void)
struct irlan_cb *new;
__u16 hints;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
/* Allocate master structure */
irlan = hashbin_new(HB_LOCK); /* protect from /proc */
if (irlan == NULL) {
......@@ -133,7 +134,7 @@ int __init irlan_init(void)
create_proc_info_entry("irlan", 0, proc_irda, irlan_proc_read);
#endif /* CONFIG_PROC_FS */
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
hints = irlmp_service_to_hint(S_LAN);
/* Register with IrLMP as a client */
......@@ -157,7 +158,7 @@ int __init irlan_init(void)
void __exit irlan_cleanup(void)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
irlmp_unregister_client(ckey);
irlmp_unregister_service(skey);
......@@ -181,7 +182,7 @@ int irlan_register_netdev(struct irlan_cb *self)
{
int i=0;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
/* Check if we should call the device eth<x> or irlan<x> */
if (!eth) {
......@@ -192,7 +193,7 @@ int irlan_register_netdev(struct irlan_cb *self)
}
if (register_netdev(&self->dev) != 0) {
IRDA_DEBUG(2, __FUNCTION__ "(), register_netdev() failed!\n");
IRDA_DEBUG(2, "%s(), register_netdev() failed!\n", __FUNCTION__ );
return -1;
}
return 0;
......@@ -208,7 +209,7 @@ struct irlan_cb *irlan_open(__u32 saddr, __u32 daddr)
{
struct irlan_cb *self;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(irlan != NULL, return NULL;);
/*
......@@ -264,7 +265,7 @@ static void __irlan_close(struct irlan_cb *self)
{
struct sk_buff *skb;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -301,7 +302,7 @@ void irlan_connect_indication(void *instance, void *sap, struct qos_info *qos,
struct irlan_cb *self;
struct tsap_cb *tsap;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
self = (struct irlan_cb *) instance;
tsap = (struct tsap_cb *) sap;
......@@ -390,7 +391,7 @@ void irlan_disconnect_indication(void *instance, void *sap, LM_REASON reason,
struct irlan_cb *self;
struct tsap_cb *tsap;
IRDA_DEBUG(0, __FUNCTION__ "(), reason=%d\n", reason);
IRDA_DEBUG(0, "%s(), reason=%d\n", __FUNCTION__ , reason);
self = (struct irlan_cb *) instance;
tsap = (struct tsap_cb *) sap;
......@@ -409,19 +410,19 @@ void irlan_disconnect_indication(void *instance, void *sap, LM_REASON reason,
switch (reason) {
case LM_USER_REQUEST: /* User request */
IRDA_DEBUG(2, __FUNCTION__ "(), User requested\n");
IRDA_DEBUG(2, "%s(), User requested\n", __FUNCTION__ );
break;
case LM_LAP_DISCONNECT: /* Unexpected IrLAP disconnect */
IRDA_DEBUG(2, __FUNCTION__ "(), Unexpected IrLAP disconnect\n");
IRDA_DEBUG(2, "%s(), Unexpected IrLAP disconnect\n", __FUNCTION__ );
break;
case LM_CONNECT_FAILURE: /* Failed to establish IrLAP connection */
IRDA_DEBUG(2, __FUNCTION__ "(), IrLAP connect failed\n");
IRDA_DEBUG(2, "%s(), IrLAP connect failed\n", __FUNCTION__ );
break;
case LM_LAP_RESET: /* IrLAP reset */
IRDA_DEBUG(2, __FUNCTION__ "(), IrLAP reset\n");
IRDA_DEBUG(2, "%s(), IrLAP reset\n", __FUNCTION__ );
break;
case LM_INIT_DISCONNECT:
IRDA_DEBUG(2, __FUNCTION__ "(), IrLMP connect failed\n");
IRDA_DEBUG(2, "%s(), IrLMP connect failed\n", __FUNCTION__ );
break;
default:
ERROR("%s(), Unknown disconnect reason\n", __FUNCTION__);
......@@ -446,7 +447,7 @@ void irlan_open_data_tsap(struct irlan_cb *self)
struct tsap_cb *tsap;
notify_t notify;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -468,7 +469,7 @@ void irlan_open_data_tsap(struct irlan_cb *self)
tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, &notify);
if (!tsap) {
IRDA_DEBUG(2, __FUNCTION__ "(), Got no tsap!\n");
IRDA_DEBUG(2, "%s(), Got no tsap!\n", __FUNCTION__ );
return;
}
self->tsap_data = tsap;
......@@ -482,7 +483,7 @@ void irlan_open_data_tsap(struct irlan_cb *self)
void irlan_close_tsaps(struct irlan_cb *self)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -572,7 +573,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
{
struct sk_buff *skb;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
if (irda_lock(&self->client.tx_busy) == FALSE)
return -EBUSY;
......@@ -591,7 +592,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
dev_kfree_skb(skb);
return -1;
}
IRDA_DEBUG(2, __FUNCTION__ "(), sending ...\n");
IRDA_DEBUG(2, "%s(), sending ...\n", __FUNCTION__ );
return irttp_data_request(self->client.tsap_ctrl, skb);
}
......@@ -604,7 +605,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
*/
void irlan_ctrl_data_request(struct irlan_cb *self, struct sk_buff *skb)
{
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
/* Queue command */
skb_queue_tail(&self->client.txq, skb);
......@@ -624,7 +625,7 @@ void irlan_get_provider_info(struct irlan_cb *self)
struct sk_buff *skb;
__u8 *frame;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -656,7 +657,7 @@ void irlan_open_data_channel(struct irlan_cb *self)
struct sk_buff *skb;
__u8 *frame;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -688,7 +689,7 @@ void irlan_close_data_channel(struct irlan_cb *self)
struct sk_buff *skb;
__u8 *frame;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -727,7 +728,7 @@ void irlan_open_unicast_addr(struct irlan_cb *self)
struct sk_buff *skb;
__u8 *frame;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -765,7 +766,7 @@ void irlan_set_broadcast_filter(struct irlan_cb *self, int status)
struct sk_buff *skb;
__u8 *frame;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -804,7 +805,7 @@ void irlan_set_multicast_filter(struct irlan_cb *self, int status)
struct sk_buff *skb;
__u8 *frame;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -844,7 +845,7 @@ void irlan_get_unicast_addr(struct irlan_cb *self)
struct sk_buff *skb;
__u8 *frame;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -879,7 +880,7 @@ void irlan_get_media_char(struct irlan_cb *self)
struct sk_buff *skb;
__u8 *frame;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -964,7 +965,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
int n=0;
if (skb == NULL) {
IRDA_DEBUG(2, __FUNCTION__ "(), Got NULL skb\n");
IRDA_DEBUG(2, "%s(), Got NULL skb\n", __FUNCTION__ );
return 0;
}
......@@ -981,7 +982,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
ASSERT(value_len > 0, return 0;);
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown parameter type!\n");
IRDA_DEBUG(2, "%s(), Unknown parameter type!\n", __FUNCTION__ );
return 0;
break;
}
......@@ -991,7 +992,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
/* Make space for data */
if (skb_tailroom(skb) < (param_len+value_len+3)) {
IRDA_DEBUG(2, __FUNCTION__ "(), No more space at end of skb\n");
IRDA_DEBUG(2, "%s(), No more space at end of skb\n", __FUNCTION__ );
return 0;
}
skb_put(skb, param_len+value_len+3);
......@@ -1038,13 +1039,13 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len)
__u16 val_len;
int n=0;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
/* get length of parameter name (1 byte) */
name_len = buf[n++];
if (name_len > 254) {
IRDA_DEBUG(2, __FUNCTION__ "(), name_len > 254\n");
IRDA_DEBUG(2, "%s(), name_len > 254\n", __FUNCTION__ );
return -RSP_INVALID_COMMAND_FORMAT;
}
......@@ -1061,7 +1062,7 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len)
le16_to_cpus(&val_len); n+=2;
if (val_len > 1016) {
IRDA_DEBUG(2, __FUNCTION__ "(), parameter length to long\n");
IRDA_DEBUG(2, "%s(), parameter length to long\n", __FUNCTION__ );
return -RSP_INVALID_COMMAND_FORMAT;
}
*len = val_len;
......
net/irda/irlan/irlan_eth.c
View file @ 887e8e0f
......@@ -50,7 +50,7 @@ int irlan_eth_init(struct net_device *dev)
{
struct irlan_cb *self;
IRDA_DEBUG(2, __FUNCTION__"()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(dev != NULL, return -1;);
......@@ -107,7 +107,7 @@ int irlan_eth_open(struct net_device *dev)
{
struct irlan_cb *self;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(dev != NULL, return -1;);
......@@ -143,7 +143,7 @@ int irlan_eth_close(struct net_device *dev)
struct irlan_cb *self = (struct irlan_cb *) dev->priv;
struct sk_buff *skb;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
/* Stop device */
netif_stop_queue(dev);
......@@ -356,14 +356,14 @@ void irlan_eth_set_multicast_list(struct net_device *dev)
self = dev->priv;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
/* Check if data channel has been connected yet */
if (self->client.state != IRLAN_DATA) {
IRDA_DEBUG(1, __FUNCTION__ "(), delaying!\n");
IRDA_DEBUG(1, "%s(), delaying!\n", __FUNCTION__ );
return;
}
......@@ -373,20 +373,20 @@ void irlan_eth_set_multicast_list(struct net_device *dev)
}
else if ((dev->flags & IFF_ALLMULTI) || dev->mc_count > HW_MAX_ADDRS) {
/* Disable promiscuous mode, use normal mode. */
IRDA_DEBUG(4, __FUNCTION__ "(), Setting multicast filter\n");
IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __FUNCTION__ );
/* hardware_set_filter(NULL); */
irlan_set_multicast_filter(self, TRUE);
}
else if (dev->mc_count) {
IRDA_DEBUG(4, __FUNCTION__ "(), Setting multicast filter\n");
IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __FUNCTION__ );
/* Walk the address list, and load the filter */
/* hardware_set_filter(dev->mc_list); */
irlan_set_multicast_filter(self, TRUE);
}
else {
IRDA_DEBUG(4, __FUNCTION__ "(), Clearing multicast filter\n");
IRDA_DEBUG(4, "%s(), Clearing multicast filter\n", __FUNCTION__ );
irlan_set_multicast_filter(self, FALSE);
}
......
net/irda/irlan/irlan_event.c
View file @ 887e8e0f
......@@ -40,7 +40,7 @@ char *irlan_state[] = {
void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state)
{
IRDA_DEBUG(2, __FUNCTION__"(), %s\n", irlan_state[state]);
IRDA_DEBUG(2, "%s(), %s\n", __FUNCTION__ , irlan_state[state]);
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -50,7 +50,7 @@ void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state)
void irlan_next_provider_state(struct irlan_cb *self, IRLAN_STATE state)
{
IRDA_DEBUG(2, __FUNCTION__"(), %s\n", irlan_state[state]);
IRDA_DEBUG(2, "%s(), %s\n", __FUNCTION__ , irlan_state[state]);
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......
net/irda/irlan/irlan_filter.c
View file @ 887e8e0f
......@@ -143,7 +143,7 @@ void irlan_check_command_param(struct irlan_cb *self, char *param, char *value)
{
__u8 *bytes;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
bytes = value;
......@@ -156,7 +156,7 @@ void irlan_check_command_param(struct irlan_cb *self, char *param, char *value)
* This is experimental!! DB.
*/
if (strcmp(param, "MODE") == 0) {
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
self->use_udata = TRUE;
return;
}
......
net/irda/irlan/irlan_provider.c
View file @ 887e8e0f
......@@ -70,7 +70,7 @@ static int irlan_provider_data_indication(void *instance, void *sap,
struct irlan_cb *self;
__u8 code;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
self = (struct irlan_cb *) instance;
......@@ -99,15 +99,15 @@ static int irlan_provider_data_indication(void *instance, void *sap,
irlan_do_provider_event(self, IRLAN_FILTER_CONFIG_CMD, skb);
break;
case CMD_RECONNECT_DATA_CHAN:
IRDA_DEBUG(2, __FUNCTION__"(), Got RECONNECT_DATA_CHAN command\n");
IRDA_DEBUG(2, __FUNCTION__"(), NOT IMPLEMENTED\n");
IRDA_DEBUG(2, "%s(), Got RECONNECT_DATA_CHAN command\n", __FUNCTION__ );
IRDA_DEBUG(2, "%s(), NOT IMPLEMENTED\n", __FUNCTION__ );
break;
case CMD_CLOSE_DATA_CHAN:
IRDA_DEBUG(2, "Got CLOSE_DATA_CHAN command!\n");
IRDA_DEBUG(2, __FUNCTION__"(), NOT IMPLEMENTED\n");
IRDA_DEBUG(2, "%s(), NOT IMPLEMENTED\n", __FUNCTION__ );
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown command!\n");
IRDA_DEBUG(2, "%s(), Unknown command!\n", __FUNCTION__ );
break;
}
return 0;
......@@ -129,7 +129,7 @@ static void irlan_provider_connect_indication(void *instance, void *sap,
struct tsap_cb *tsap;
__u32 saddr, daddr;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
self = (struct irlan_cb *) instance;
tsap = (struct tsap_cb *) sap;
......@@ -182,7 +182,7 @@ void irlan_provider_disconnect_indication(void *instance, void *sap,
struct irlan_cb *self;
struct tsap_cb *tsap;
IRDA_DEBUG(4, __FUNCTION__ "(), reason=%d\n", reason);
IRDA_DEBUG(4, "%s(), reason=%d\n", __FUNCTION__ , reason);
self = (struct irlan_cb *) instance;
tsap = (struct tsap_cb *) sap;
......@@ -236,7 +236,7 @@ int irlan_provider_parse_command(struct irlan_cb *self, int cmd,
ASSERT(skb != NULL, return -RSP_PROTOCOL_ERROR;);
IRDA_DEBUG(4, __FUNCTION__ "(), skb->len=%d\n", (int)skb->len);
IRDA_DEBUG(4, "%s(), skb->len=%d\n", __FUNCTION__ , (int)skb->len);
ASSERT(self != NULL, return -RSP_PROTOCOL_ERROR;);
ASSERT(self->magic == IRLAN_MAGIC, return -RSP_PROTOCOL_ERROR;);
......@@ -266,7 +266,7 @@ int irlan_provider_parse_command(struct irlan_cb *self, int cmd,
for (i=0; i<count;i++) {
ret = irlan_extract_param(ptr, name, value, &val_len);
if (ret < 0) {
IRDA_DEBUG(2, __FUNCTION__ "(), IrLAN, Error!\n");
IRDA_DEBUG(2, "%s(), IrLAN, Error!\n", __FUNCTION__ );
break;
}
ptr+=ret;
......@@ -291,7 +291,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
{
struct sk_buff *skb;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;);
......@@ -316,7 +316,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
irlan_insert_string_param(skb, "MEDIA", "802.5");
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), unknown media type!\n");
IRDA_DEBUG(2, "%s(), unknown media type!\n", __FUNCTION__ );
break;
}
irlan_insert_short_param(skb, "IRLAN_VER", 0x0101);
......@@ -340,7 +340,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
irlan_insert_string_param(skb, "ACCESS_TYPE", "HOSTED");
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown access type\n");
IRDA_DEBUG(2, "%s(), Unknown access type\n", __FUNCTION__ );
break;
}
irlan_insert_short_param(skb, "MAX_FRAME", 0x05ee);
......@@ -361,7 +361,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
handle_filter_request(self, skb);
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown command!\n");
IRDA_DEBUG(2, "%s(), Unknown command!\n", __FUNCTION__ );
break;
}
......@@ -379,7 +379,7 @@ int irlan_provider_open_ctrl_tsap(struct irlan_cb *self)
struct tsap_cb *tsap;
notify_t notify;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRLAN_MAGIC, return -1;);
......@@ -400,7 +400,7 @@ int irlan_provider_open_ctrl_tsap(struct irlan_cb *self)
tsap = irttp_open_tsap(LSAP_ANY, 1, &notify);
if (!tsap) {
IRDA_DEBUG(2, __FUNCTION__ "(), Got no tsap!\n");
IRDA_DEBUG(2, "%s(), Got no tsap!\n", __FUNCTION__ );
return -1;
}
self->provider.tsap_ctrl = tsap;
......
net/irda/irlan/irlan_provider_event.c
View file @ 887e8e0f
......@@ -72,7 +72,7 @@ void irlan_do_provider_event(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_provider_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
......@@ -82,7 +82,7 @@ static int irlan_provider_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_provider_state( self, IRLAN_INFO);
break;
default:
IRDA_DEBUG(4, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG(4, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break;
}
if (skb)
......@@ -101,7 +101,7 @@ static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
{
int ret;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
......@@ -147,7 +147,7 @@ static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_provider_state(self, IRLAN_IDLE);
break;
default:
IRDA_DEBUG( 0, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG( 0, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break;
}
if (skb)
......@@ -166,7 +166,7 @@ static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
......@@ -186,7 +186,7 @@ static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_provider_state(self, IRLAN_IDLE);
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break;
}
if (skb)
......@@ -205,7 +205,7 @@ static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRLAN_MAGIC, return -1;);
......@@ -221,7 +221,7 @@ static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_provider_state(self, IRLAN_IDLE);
break;
default:
IRDA_DEBUG( 0, __FUNCTION__ "(), Unknown event %d\n", event);
IRDA_DEBUG( 0, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break;
}
if (skb)
......
net/irda/irlap.c
View file @ 887e8e0f
......@@ -107,7 +107,7 @@ struct irlap_cb *irlap_open(struct net_device *dev, struct qos_info *qos,
{
struct irlap_cb *self;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
/* Initialize the irlap structure. */
self = kmalloc(sizeof(struct irlap_cb), GFP_KERNEL);
......@@ -210,7 +210,7 @@ void irlap_close(struct irlap_cb *self)
{
struct irlap_cb *lap;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -223,7 +223,7 @@ void irlap_close(struct irlap_cb *self)
/* Be sure that we manage to remove ourself from the hash */
lap = hashbin_remove(irlap, self->saddr, NULL);
if (!lap) {
IRDA_DEBUG(1, __FUNCTION__ "(), Didn't find myself!\n");
IRDA_DEBUG(1, "%s(), Didn't find myself!\n", __FUNCTION__);
return;
}
__irlap_close(lap);
......@@ -237,7 +237,7 @@ void irlap_close(struct irlap_cb *self)
*/
void irlap_connect_indication(struct irlap_cb *self, struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -257,7 +257,7 @@ void irlap_connect_indication(struct irlap_cb *self, struct sk_buff *skb)
*/
void irlap_connect_response(struct irlap_cb *self, struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
irlap_do_event(self, CONNECT_RESPONSE, skb, NULL);
kfree_skb(skb);
......@@ -273,7 +273,7 @@ void irlap_connect_response(struct irlap_cb *self, struct sk_buff *skb)
void irlap_connect_request(struct irlap_cb *self, __u32 daddr,
struct qos_info *qos_user, int sniff)
{
IRDA_DEBUG(3, __FUNCTION__ "(), daddr=0x%08x\n", daddr);
IRDA_DEBUG(3, "%s(), daddr=0x%08x\n", __FUNCTION__, daddr);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -300,7 +300,7 @@ void irlap_connect_request(struct irlap_cb *self, __u32 daddr,
*/
void irlap_connect_confirm(struct irlap_cb *self, struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -339,7 +339,7 @@ void irlap_data_request(struct irlap_cb *self, struct sk_buff *skb,
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
IRDA_DEBUG(3, __FUNCTION__ "()\n");
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
ASSERT(skb_headroom(skb) >= (LAP_ADDR_HEADER+LAP_CTRL_HEADER),
return;);
......@@ -383,7 +383,7 @@ void irlap_unitdata_request(struct irlap_cb *self, struct sk_buff *skb)
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
IRDA_DEBUG(3, __FUNCTION__ "()\n");
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
ASSERT(skb_headroom(skb) >= (LAP_ADDR_HEADER+LAP_CTRL_HEADER),
return;);
......@@ -407,7 +407,7 @@ void irlap_unitdata_request(struct irlap_cb *self, struct sk_buff *skb)
#ifdef CONFIG_IRDA_ULTRA
void irlap_unitdata_indication(struct irlap_cb *self, struct sk_buff *skb)
{
IRDA_DEBUG(1, __FUNCTION__ "()\n");
IRDA_DEBUG(1, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -428,7 +428,7 @@ void irlap_unitdata_indication(struct irlap_cb *self, struct sk_buff *skb)
*/
void irlap_disconnect_request(struct irlap_cb *self)
{
IRDA_DEBUG(3, __FUNCTION__ "()\n");
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -450,7 +450,7 @@ void irlap_disconnect_request(struct irlap_cb *self)
irlap_do_event(self, DISCONNECT_REQUEST, NULL, NULL);
break;
default:
IRDA_DEBUG(2, __FUNCTION__ "(), disconnect pending!\n");
IRDA_DEBUG(2, "%s(), disconnect pending!\n", __FUNCTION__);
self->disconnect_pending = TRUE;
break;
}
......@@ -464,7 +464,7 @@ void irlap_disconnect_request(struct irlap_cb *self)
*/
void irlap_disconnect_indication(struct irlap_cb *self, LAP_REASON reason)
{
IRDA_DEBUG(1, __FUNCTION__ "(), reason=%s\n", lap_reasons[reason]);
IRDA_DEBUG(1, "%s(), reason=%s\n", __FUNCTION__, lap_reasons[reason]);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -474,7 +474,7 @@ void irlap_disconnect_indication(struct irlap_cb *self, LAP_REASON reason)
switch (reason) {
case LAP_RESET_INDICATION:
IRDA_DEBUG(1, __FUNCTION__ "(), Sending reset request!\n");
IRDA_DEBUG(1, "%s(), Sending reset request!\n", __FUNCTION__);
irlap_do_event(self, RESET_REQUEST, NULL, NULL);
break;
case LAP_NO_RESPONSE: /* FALLTROUGH */
......@@ -503,7 +503,7 @@ void irlap_discovery_request(struct irlap_cb *self, discovery_t *discovery)
ASSERT(self->magic == LAP_MAGIC, return;);
ASSERT(discovery != NULL, return;);
IRDA_DEBUG(4, __FUNCTION__ "(), nslots = %d\n", discovery->nslots);
IRDA_DEBUG(4, "%s(), nslots = %d\n", __FUNCTION__, discovery->nslots);
ASSERT((discovery->nslots == 1) || (discovery->nslots == 6) ||
(discovery->nslots == 8) || (discovery->nslots == 16),
......@@ -511,8 +511,8 @@ void irlap_discovery_request(struct irlap_cb *self, discovery_t *discovery)
/* Discovery is only possible in NDM mode */
if (self->state != LAP_NDM) {
IRDA_DEBUG(4, __FUNCTION__
"(), discovery only possible in NDM mode\n");
IRDA_DEBUG(4, "%s(), discovery only possible in NDM mode\n",
__FUNCTION__);
irlap_discovery_confirm(self, NULL);
/* Note : in theory, if we are not in NDM, we could postpone
* the discovery like we do for connection request.
......@@ -584,7 +584,7 @@ void irlap_discovery_confirm(struct irlap_cb *self, hashbin_t *discovery_log)
*/
void irlap_discovery_indication(struct irlap_cb *self, discovery_t *discovery)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -630,7 +630,7 @@ void irlap_status_indication(struct irlap_cb *self, int quality_of_link)
*/
void irlap_reset_indication(struct irlap_cb *self)
{
IRDA_DEBUG(1, __FUNCTION__ "()\n");
IRDA_DEBUG(1, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -646,7 +646,7 @@ void irlap_reset_indication(struct irlap_cb *self)
*/
void irlap_reset_confirm(void)
{
IRDA_DEBUG(1, __FUNCTION__ "()\n");
IRDA_DEBUG(1, "%s()\n", __FUNCTION__);
}
/*
......@@ -746,7 +746,7 @@ int irlap_validate_nr_received(struct irlap_cb *self, int nr)
{
/* nr as expected? */
if (nr == self->vs) {
IRDA_DEBUG(4, __FUNCTION__ "(), expected!\n");
IRDA_DEBUG(4, "%s(), expected!\n", __FUNCTION__);
return NR_EXPECTED;
}
......@@ -774,7 +774,7 @@ int irlap_validate_nr_received(struct irlap_cb *self, int nr)
*/
void irlap_initiate_connection_state(struct irlap_cb *self)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -857,7 +857,7 @@ void irlap_change_speed(struct irlap_cb *self, __u32 speed, int now)
{
struct sk_buff *skb;
IRDA_DEBUG(0, __FUNCTION__ "(), setting speed to %d\n", speed);
IRDA_DEBUG(0, "%s(), setting speed to %d\n", __FUNCTION__, speed);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -899,7 +899,7 @@ void irlap_init_qos_capabilities(struct irlap_cb *self,
* user may not have set all of them.
*/
if (qos_user) {
IRDA_DEBUG(1, __FUNCTION__ "(), Found user specified QoS!\n");
IRDA_DEBUG(1, "%s(), Found user specified QoS!\n", __FUNCTION__);
if (qos_user->baud_rate.bits)
self->qos_rx.baud_rate.bits &= qos_user->baud_rate.bits;
......@@ -929,7 +929,7 @@ void irlap_init_qos_capabilities(struct irlap_cb *self,
*/
void irlap_apply_default_connection_parameters(struct irlap_cb *self)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -992,7 +992,7 @@ void irlap_apply_default_connection_parameters(struct irlap_cb *self)
*/
void irlap_apply_connection_parameters(struct irlap_cb *self, int now)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......
net/irda/irlap_event.c
View file @ 887e8e0f
This diff is collapsed.
net/irda/irlap_frame.c
View file @ 887e8e0f
......@@ -167,8 +167,8 @@ static void irlap_recv_snrm_cmd(struct irlap_cb *self, struct sk_buff *skb,
/* Check if the new connection address is valid */
if ((info->caddr == 0x00) || (info->caddr == 0xfe)) {
IRDA_DEBUG(3, __FUNCTION__
"(), invalid connection address!\n");
IRDA_DEBUG(3, "%s(), invalid connection address!\n",
__FUNCTION__);
return;
}
......@@ -178,7 +178,8 @@ static void irlap_recv_snrm_cmd(struct irlap_cb *self, struct sk_buff *skb,
/* Only accept if addressed directly to us */
if (info->saddr != self->saddr) {
IRDA_DEBUG(2, __FUNCTION__ "(), not addressed to us!\n");
IRDA_DEBUG(2, "%s(), not addressed to us!\n",
__FUNCTION__);
return;
}
irlap_do_event(self, RECV_SNRM_CMD, skb, info);
......@@ -200,7 +201,7 @@ void irlap_send_ua_response_frame(struct irlap_cb *self, struct qos_info *qos)
struct ua_frame *frame;
int ret;
IRDA_DEBUG(2, __FUNCTION__ "() <%ld>\n", jiffies);
IRDA_DEBUG(2, "%s() <%ld>\n", __FUNCTION__, jiffies);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -275,7 +276,7 @@ void irlap_send_disc_frame(struct irlap_cb *self)
struct sk_buff *skb = NULL;
__u8 *frame;
IRDA_DEBUG(3, __FUNCTION__ "()\n");
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -306,8 +307,8 @@ void irlap_send_discovery_xid_frame(struct irlap_cb *self, int S, __u8 s,
__u32 bcast = BROADCAST;
__u8 *info;
IRDA_DEBUG(4, __FUNCTION__ "(), s=%d, S=%d, command=%d\n", s, S,
command);
IRDA_DEBUG(4, "%s(), s=%d, S=%d, command=%d\n", __FUNCTION__,
s, S, command);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -398,7 +399,7 @@ static void irlap_recv_discovery_xid_rsp(struct irlap_cb *self,
__u8 *discovery_info;
char *text;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -410,8 +411,8 @@ static void irlap_recv_discovery_xid_rsp(struct irlap_cb *self,
/* Make sure frame is addressed to us */
if ((info->saddr != self->saddr) && (info->saddr != BROADCAST)) {
IRDA_DEBUG(0, __FUNCTION__
"(), frame is not addressed to us!\n");
IRDA_DEBUG(0, "%s(), frame is not addressed to us!\n",
__FUNCTION__);
return;
}
......@@ -425,7 +426,7 @@ static void irlap_recv_discovery_xid_rsp(struct irlap_cb *self,
discovery->saddr = self->saddr;
discovery->timestamp = jiffies;
IRDA_DEBUG(4, __FUNCTION__ "(), daddr=%08x\n", discovery->daddr);
IRDA_DEBUG(4, "%s(), daddr=%08x\n", __FUNCTION__, discovery->daddr);
discovery_info = skb_pull(skb, sizeof(struct xid_frame));
......@@ -476,8 +477,8 @@ static void irlap_recv_discovery_xid_cmd(struct irlap_cb *self,
/* Make sure frame is addressed to us */
if ((info->saddr != self->saddr) && (info->saddr != BROADCAST)) {
IRDA_DEBUG(0, __FUNCTION__
"(), frame is not addressed to us!\n");
IRDA_DEBUG(0, "%s(), frame is not addressed to us!\n",
__FUNCTION__);
return;
}
......@@ -642,7 +643,7 @@ void irlap_send_frmr_frame( struct irlap_cb *self, int command)
frame[2] = 0;
IRDA_DEBUG(4, __FUNCTION__ "(), vr=%d, %ld\n",self->vr, jiffies);
IRDA_DEBUG(4, "%s(), vr=%d, %ld\n", __FUNCTION__, self->vr, jiffies);
irlap_queue_xmit(self, skb);
}
......@@ -658,7 +659,7 @@ static void irlap_recv_rnr_frame(struct irlap_cb *self, struct sk_buff *skb,
{
info->nr = skb->data[1] >> 5;
IRDA_DEBUG(4, __FUNCTION__ "(), nr=%d, %ld\n", info->nr, jiffies);
IRDA_DEBUG(4, "%s(), nr=%d, %ld\n", __FUNCTION__, info->nr, jiffies);
if (command)
irlap_do_event(self, RECV_RNR_CMD, skb, info);
......@@ -669,7 +670,7 @@ static void irlap_recv_rnr_frame(struct irlap_cb *self, struct sk_buff *skb,
static void irlap_recv_rej_frame(struct irlap_cb *self, struct sk_buff *skb,
struct irlap_info *info, int command)
{
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__);
info->nr = skb->data[1] >> 5;
......@@ -683,7 +684,7 @@ static void irlap_recv_rej_frame(struct irlap_cb *self, struct sk_buff *skb,
static void irlap_recv_srej_frame(struct irlap_cb *self, struct sk_buff *skb,
struct irlap_info *info, int command)
{
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__);
info->nr = skb->data[1] >> 5;
......@@ -697,7 +698,7 @@ static void irlap_recv_srej_frame(struct irlap_cb *self, struct sk_buff *skb,
static void irlap_recv_disc_frame(struct irlap_cb *self, struct sk_buff *skb,
struct irlap_info *info, int command)
{
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
/* Check if this is a command or a response frame */
if (command)
......@@ -754,7 +755,7 @@ void irlap_send_data_primary(struct irlap_cb *self, struct sk_buff *skb)
irlap_send_i_frame( self, tx_skb, CMD_FRAME);
} else {
IRDA_DEBUG(4, __FUNCTION__ "(), sending unreliable frame\n");
IRDA_DEBUG(4, "%s(), sending unreliable frame\n", __FUNCTION__);
irlap_send_ui_frame(self, skb_get(skb), self->caddr, CMD_FRAME);
self->window -= 1;
}
......@@ -803,7 +804,7 @@ void irlap_send_data_primary_poll(struct irlap_cb *self, struct sk_buff *skb)
irlap_send_i_frame(self, tx_skb, CMD_FRAME);
} else {
IRDA_DEBUG(4, __FUNCTION__ "(), sending unreliable frame\n");
IRDA_DEBUG(4, "%s(), sending unreliable frame\n", __FUNCTION__);
if (self->ack_required) {
irlap_send_ui_frame(self, skb_get(skb), self->caddr, CMD_FRAME);
......@@ -952,7 +953,7 @@ void irlap_resend_rejected_frames(struct irlap_cb *self, int command)
/* tx_skb = skb_clone( skb, GFP_ATOMIC); */
tx_skb = skb_copy(skb, GFP_ATOMIC);
if (!tx_skb) {
IRDA_DEBUG(0, __FUNCTION__ "(), unable to copy\n");
IRDA_DEBUG(0, "%s(), unable to copy\n", __FUNCTION__);
return;
}
/* Unlink tx_skb from list */
......@@ -987,7 +988,7 @@ void irlap_resend_rejected_frames(struct irlap_cb *self, int command)
*/
while (skb_queue_len( &self->txq) > 0) {
IRDA_DEBUG(0, __FUNCTION__ "(), sending additional frames!\n");
IRDA_DEBUG(0, "%s(), sending additional frames!\n", __FUNCTION__);
if ((skb_queue_len( &self->txq) > 0) &&
(self->window > 0)) {
skb = skb_dequeue( &self->txq);
......@@ -1032,7 +1033,7 @@ void irlap_resend_rejected_frame(struct irlap_cb *self, int command)
/* tx_skb = skb_clone( skb, GFP_ATOMIC); */
tx_skb = skb_copy(skb, GFP_ATOMIC);
if (!tx_skb) {
IRDA_DEBUG(0, __FUNCTION__ "(), unable to copy\n");
IRDA_DEBUG(0, "%s(), unable to copy\n", __FUNCTION__);
return;
}
/* Unlink tx_skb from list */
......@@ -1058,7 +1059,7 @@ void irlap_resend_rejected_frame(struct irlap_cb *self, int command)
void irlap_send_ui_frame(struct irlap_cb *self, struct sk_buff *skb,
__u8 caddr, int command)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -1118,7 +1119,7 @@ static inline void irlap_recv_i_frame(struct irlap_cb *self,
static void irlap_recv_ui_frame(struct irlap_cb *self, struct sk_buff *skb,
struct irlap_info *info)
{
IRDA_DEBUG( 4, __FUNCTION__ "()\n");
IRDA_DEBUG( 4, "%s()\n", __FUNCTION__);
info->pf = skb->data[1] & PF_BIT; /* Final bit */
......@@ -1137,7 +1138,7 @@ static void irlap_recv_frmr_frame(struct irlap_cb *self, struct sk_buff *skb,
__u8 *frame;
int w, x, y, z;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LAP_MAGIC, return;);
......@@ -1226,15 +1227,15 @@ static void irlap_recv_test_frame(struct irlap_cb *self, struct sk_buff *skb,
{
struct test_frame *frame;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
frame = (struct test_frame *) skb->data;
/* Broadcast frames must carry saddr and daddr fields */
if (info->caddr == CBROADCAST) {
if (skb->len < sizeof(struct test_frame)) {
IRDA_DEBUG(0, __FUNCTION__
"() test frame to short!\n");
IRDA_DEBUG(0, "%s() test frame to short!\n",
__FUNCTION__);
return;
}
......@@ -1296,7 +1297,8 @@ int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev,
/* First we check if this frame has a valid connection address */
if ((info.caddr != self->caddr) && (info.caddr != CBROADCAST)) {
IRDA_DEBUG(0, __FUNCTION__ "(), wrong connection address!\n");
IRDA_DEBUG(0, "%s(), wrong connection address!\n",
__FUNCTION__);
goto out;
}
/*
......
net/irda/irlmp.c
View file @ 887e8e0f
This diff is collapsed.
net/irda/irlmp_event.c
View file @ 887e8e0f
This diff is collapsed.
net/irda/irlmp_frame.c
View file @ 887e8e0f
......@@ -45,7 +45,7 @@ inline void irlmp_send_data_pdu(struct lap_cb *self, __u8 dlsap, __u8 slsap,
skb->data[1] = slsap;
if (expedited) {
IRDA_DEBUG(4, __FUNCTION__ "(), sending expedited data\n");
IRDA_DEBUG(4, "%s(), sending expedited data\n", __FUNCTION__);
irlap_data_request(self->irlap, skb, TRUE);
} else
irlap_data_request(self->irlap, skb, FALSE);
......@@ -61,7 +61,7 @@ void irlmp_send_lcf_pdu(struct lap_cb *self, __u8 dlsap, __u8 slsap,
{
__u8 *frame;
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LMP_LAP_MAGIC, return;);
......@@ -96,7 +96,7 @@ void irlmp_link_data_indication(struct lap_cb *self, struct sk_buff *skb,
__u8 dlsap_sel; /* Destination LSAP address */
__u8 *fp;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LMP_LAP_MAGIC, return;);
......@@ -116,9 +116,9 @@ void irlmp_link_data_indication(struct lap_cb *self, struct sk_buff *skb,
* it in a different way than other established connections.
*/
if ((fp[0] & CONTROL_BIT) && (fp[2] == CONNECT_CMD)) {
IRDA_DEBUG(3, __FUNCTION__ "(), incoming connection, "
IRDA_DEBUG(3, "%s(), incoming connection, "
"source LSAP=%d, dest LSAP=%d\n",
slsap_sel, dlsap_sel);
__FUNCTION__, slsap_sel, dlsap_sel);
/* Try to find LSAP among the unconnected LSAPs */
lsap = irlmp_find_lsap(self, dlsap_sel, slsap_sel, CONNECT_CMD,
......@@ -126,7 +126,7 @@ void irlmp_link_data_indication(struct lap_cb *self, struct sk_buff *skb,
/* Maybe LSAP was already connected, so try one more time */
if (!lsap) {
IRDA_DEBUG(1, __FUNCTION__ "(), incoming connection for LSAP already connected\n");
IRDA_DEBUG(1, "%s(), incoming connection for LSAP already connected\n", __FUNCTION__);
lsap = irlmp_find_lsap(self, dlsap_sel, slsap_sel, 0,
self->lsaps);
}
......@@ -136,14 +136,13 @@ void irlmp_link_data_indication(struct lap_cb *self, struct sk_buff *skb,
if (lsap == NULL) {
IRDA_DEBUG(2, "IrLMP, Sorry, no LSAP for received frame!\n");
IRDA_DEBUG(2, __FUNCTION__
"(), slsap_sel = %02x, dlsap_sel = %02x\n", slsap_sel,
dlsap_sel);
IRDA_DEBUG(2, "%s(), slsap_sel = %02x, dlsap_sel = %02x\n",
__FUNCTION__, slsap_sel, dlsap_sel);
if (fp[0] & CONTROL_BIT) {
IRDA_DEBUG(2, __FUNCTION__
"(), received control frame %02x\n", fp[2]);
IRDA_DEBUG(2, "%s(), received control frame %02x\n",
__FUNCTION__, fp[2]);
} else {
IRDA_DEBUG(2, __FUNCTION__ "(), received data frame\n");
IRDA_DEBUG(2, "%s(), received data frame\n", __FUNCTION__);
}
dev_kfree_skb(skb);
return;
......@@ -162,8 +161,8 @@ void irlmp_link_data_indication(struct lap_cb *self, struct sk_buff *skb,
irlmp_do_lsap_event(lsap, LM_CONNECT_CONFIRM, skb);
break;
case DISCONNECT:
IRDA_DEBUG(4, __FUNCTION__
"(), Disconnect indication!\n");
IRDA_DEBUG(4, "%s(), Disconnect indication!\n",
__FUNCTION__);
irlmp_do_lsap_event(lsap, LM_DISCONNECT_INDICATION,
skb);
break;
......@@ -176,8 +175,8 @@ void irlmp_link_data_indication(struct lap_cb *self, struct sk_buff *skb,
dev_kfree_skb(skb);
break;
default:
IRDA_DEBUG(0, __FUNCTION__
"(), Unknown control frame %02x\n", fp[2]);
IRDA_DEBUG(0, "%s(), Unknown control frame %02x\n",
__FUNCTION__, fp[2]);
dev_kfree_skb(skb);
break;
}
......@@ -212,7 +211,7 @@ void irlmp_link_unitdata_indication(struct lap_cb *self, struct sk_buff *skb)
__u8 *fp;
unsigned long flags;
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LMP_LAP_MAGIC, return;);
......@@ -229,7 +228,8 @@ void irlmp_link_unitdata_indication(struct lap_cb *self, struct sk_buff *skb)
pid = fp[2];
if (pid & 0x80) {
IRDA_DEBUG(0, __FUNCTION__ "(), extension in PID not supp!\n");
IRDA_DEBUG(0, "%s(), extension in PID not supp!\n",
__FUNCTION__);
dev_kfree_skb(skb);
return;
......@@ -237,7 +237,7 @@ void irlmp_link_unitdata_indication(struct lap_cb *self, struct sk_buff *skb)
/* Check if frame is addressed to the connectionless LSAP */
if ((slsap_sel != LSAP_CONNLESS) || (dlsap_sel != LSAP_CONNLESS)) {
IRDA_DEBUG(0, __FUNCTION__ "(), dropping frame!\n");
IRDA_DEBUG(0, "%s(), dropping frame!\n", __FUNCTION__);
dev_kfree_skb(skb);
return;
......@@ -263,7 +263,7 @@ void irlmp_link_unitdata_indication(struct lap_cb *self, struct sk_buff *skb)
if (lsap)
irlmp_connless_data_indication(lsap, skb);
else {
IRDA_DEBUG(0, __FUNCTION__ "(), found no matching LSAP!\n");
IRDA_DEBUG(0, "%s(), found no matching LSAP!\n", __FUNCTION__);
dev_kfree_skb(skb);
}
}
......@@ -280,7 +280,7 @@ void irlmp_link_disconnect_indication(struct lap_cb *lap,
LAP_REASON reason,
struct sk_buff *userdata)
{
IRDA_DEBUG(2, __FUNCTION__ "()\n");
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
ASSERT(lap != NULL, return;);
ASSERT(lap->magic == LMP_LAP_MAGIC, return;);
......@@ -308,7 +308,7 @@ void irlmp_link_connect_indication(struct lap_cb *self, __u32 saddr,
__u32 daddr, struct qos_info *qos,
struct sk_buff *skb)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
/* Copy QoS settings for this session */
self->qos = qos;
......@@ -329,7 +329,7 @@ void irlmp_link_connect_indication(struct lap_cb *self, __u32 saddr,
void irlmp_link_connect_confirm(struct lap_cb *self, struct qos_info *qos,
struct sk_buff *userdata)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LMP_LAP_MAGIC, return;);
......@@ -397,7 +397,7 @@ void irlmp_link_discovery_indication(struct lap_cb *self,
*/
void irlmp_link_discovery_confirm(struct lap_cb *self, hashbin_t *log)
{
IRDA_DEBUG(4, __FUNCTION__ "()\n");
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return;);
ASSERT(self->magic == LMP_LAP_MAGIC, return;);
......
net/irda/irnet/irnet.h
View file @ 887e8e0f
This diff is collapsed.
net/irda/irnet/irnet_irda.h
View file @ 887e8e0f
......@@ -53,7 +53,7 @@ typedef struct irnet_root
* reentrant, beware... So, we blindly protect all with spinlock */
/* Handle for the hint bit advertised in IrLMP */
__u32 skey;
void * skey;
/* Server socket part */
struct ias_object * ias_obj; /* Our service name + lsap in IAS */
......
net/irda/irqueue.c
View file @ 887e8e0f
This diff is collapsed.
net/irda/irsyms.c
View file @ 887e8e0f
......@@ -204,11 +204,11 @@ static int irda_device_event(struct notifier_block *this, unsigned long event,
switch (event) {
case NETDEV_UP:
IRDA_DEBUG(3, __FUNCTION__ "(), NETDEV_UP\n");
IRDA_DEBUG(3, "%s(), NETDEV_UP\n", __FUNCTION__);
/* irda_dev_device_up(dev); */
break;
case NETDEV_DOWN:
IRDA_DEBUG(3, __FUNCTION__ "(), NETDEV_DOWN\n");
IRDA_DEBUG(3, "%s(), NETDEV_DOWN\n", __FUNCTION__);
/* irda_kill_by_device(dev); */
/* irda_rt_device_down(dev); */
/* irda_dev_device_down(dev); */
......@@ -253,7 +253,7 @@ void irda_notify_init(notify_t *notify)
*/
int __init irda_init(void)
{
IRDA_DEBUG(0, __FUNCTION__ "()\n");
IRDA_DEBUG(0, "%s()\n", __FUNCTION__);
/* Lower layer of the stack */
irlmp_init();
......
net/irda/irttp.c
View file @ 887e8e0f
This diff is collapsed.
net/irda/parameters.c
View file @ 887e8e0f
This diff is collapsed.
net/irda/qos.c
View file @ 887e8e0f
This diff is collapsed.
net/irda/wrapper.c
View file @ 887e8e0f
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7