Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
16f0fbb6
Commit
16f0fbb6
authored
Sep 18, 2002
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix __FUNCTION__ breakage in several irda drivers
parent
a859b481
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
172 additions
and
183 deletions
+172
-183
drivers/net/irda/act200l.c
drivers/net/irda/act200l.c
+3
-3
drivers/net/irda/actisys.c
drivers/net/irda/actisys.c
+1
-1
drivers/net/irda/ali-ircc.c
drivers/net/irda/ali-ircc.c
+55
-59
drivers/net/irda/girbil.c
drivers/net/irda/girbil.c
+3
-3
drivers/net/irda/irport.c
drivers/net/irda/irport.c
+31
-33
drivers/net/irda/irtty.c
drivers/net/irda/irtty.c
+6
-8
drivers/net/irda/mcp2120.c
drivers/net/irda/mcp2120.c
+3
-3
drivers/net/irda/nsc-ircc.c
drivers/net/irda/nsc-ircc.c
+55
-58
drivers/net/irda/smc-ircc.c
drivers/net/irda/smc-ircc.c
+4
-4
drivers/net/irda/tekram.c
drivers/net/irda/tekram.c
+3
-3
drivers/net/irda/toshoboe.c
drivers/net/irda/toshoboe.c
+4
-4
drivers/net/irda/w83977af_ir.c
drivers/net/irda/w83977af_ir.c
+4
-4
No files found.
drivers/net/irda/act200l.c
View file @
16f0fbb6
...
...
@@ -158,7 +158,7 @@ static int act200l_change_speed(struct irda_task *task)
}
break
;
case
IRDA_TASK_CHILD_WAIT
:
WARNING
(
__FUNCTION__
"(), resetting dongle timed out!
\n
"
);
WARNING
(
"%s(), resetting dongle timed out!
\n
"
,
__FUNCTION__
);
ret
=
-
1
;
break
;
case
IRDA_TASK_CHILD_DONE
:
...
...
@@ -203,7 +203,7 @@ static int act200l_change_speed(struct irda_task *task)
self
->
speed_task
=
NULL
;
break
;
default:
ERROR
(
__FUNCTION__
"(), unknown state %d
\n
"
,
task
->
state
);
ERROR
(
"%s(), unknown state %d
\n
"
,
__FUNCTION__
,
task
->
state
);
irda_task_next_state
(
task
,
IRDA_TASK_DONE
);
self
->
speed_task
=
NULL
;
ret
=
-
1
;
...
...
@@ -269,7 +269,7 @@ static int act200l_reset(struct irda_task *task)
self
->
reset_task
=
NULL
;
break
;
default:
ERROR
(
__FUNCTION__
"(), unknown state %d
\n
"
,
task
->
state
);
ERROR
(
"%s(), unknown state %d
\n
"
,
__FUNCTION__
,
task
->
state
);
irda_task_next_state
(
task
,
IRDA_TASK_DONE
);
self
->
reset_task
=
NULL
;
ret
=
-
1
;
...
...
drivers/net/irda/actisys.c
View file @
16f0fbb6
...
...
@@ -259,7 +259,7 @@ static int actisys_reset(struct irda_task *task)
self
->
speed
=
9600
;
/* That's the default */
break
;
default:
ERROR
(
__FUNCTION__
"(), unknown state %d
\n
"
,
task
->
state
);
ERROR
(
"%s(), unknown state %d
\n
"
,
__FUNCTION__
,
task
->
state
);
irda_task_next_state
(
task
,
IRDA_TASK_DONE
);
self
->
reset_task
=
NULL
;
ret
=
-
1
;
...
...
drivers/net/irda/ali-ircc.c
View file @
16f0fbb6
This diff is collapsed.
Click to expand it.
drivers/net/irda/girbil.c
View file @
16f0fbb6
...
...
@@ -129,7 +129,7 @@ static int girbil_change_speed(struct irda_task *task)
}
break
;
case
IRDA_TASK_CHILD_WAIT
:
WARNING
(
__FUNCTION__
"(), resetting dongle timed out!
\n
"
);
WARNING
(
"%s(), resetting dongle timed out!
\n
"
,
__FUNCTION__
);
ret
=
-
1
;
break
;
case
IRDA_TASK_CHILD_DONE
:
...
...
@@ -168,7 +168,7 @@ static int girbil_change_speed(struct irda_task *task)
self
->
speed_task
=
NULL
;
break
;
default:
ERROR
(
__FUNCTION__
"(), unknown state %d
\n
"
,
task
->
state
);
ERROR
(
"%s(), unknown state %d
\n
"
,
__FUNCTION__
,
task
->
state
);
irda_task_next_state
(
task
,
IRDA_TASK_DONE
);
self
->
speed_task
=
NULL
;
ret
=
-
1
;
...
...
@@ -221,7 +221,7 @@ static int girbil_reset(struct irda_task *task)
self
->
reset_task
=
NULL
;
break
;
default:
ERROR
(
__FUNCTION__
"(), unknown state %d
\n
"
,
task
->
state
);
ERROR
(
"%s(), unknown state %d
\n
"
,
__FUNCTION__
,
task
->
state
);
irda_task_next_state
(
task
,
IRDA_TASK_DONE
);
self
->
reset_task
=
NULL
;
ret
=
-
1
;
...
...
drivers/net/irda/irport.c
View file @
16f0fbb6
...
...
@@ -124,7 +124,7 @@ static void __exit irport_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
])
...
...
@@ -140,15 +140,15 @@ irport_open(int i, unsigned int iobase, unsigned int irq)
void
*
ret
;
int
err
;
IRDA_DEBUG
(
1
,
__FUNCTION__
"()
\n
"
);
IRDA_DEBUG
(
1
,
"%s()
\n
"
,
__FUNCTION__
);
/*
* Allocate new instance of the driver
*/
self
=
kmalloc
(
sizeof
(
struct
irport_cb
),
GFP_KERNEL
);
if
(
!
self
)
{
ERROR
(
__FUNCTION__
"
(), can't allocate memory for "
"control block!
\n
"
);
ERROR
(
"%s
(), can't allocate memory for "
"control block!
\n
"
,
__FUNCTION__
);
return
NULL
;
}
memset
(
self
,
0
,
sizeof
(
struct
irport_cb
));
...
...
@@ -168,8 +168,8 @@ irport_open(int i, unsigned int iobase, unsigned int irq)
/* Lock the port that we need */
ret
=
request_region
(
self
->
io
.
sir_base
,
self
->
io
.
sir_ext
,
driver_name
);
if
(
!
ret
)
{
IRDA_DEBUG
(
0
,
__FUNCTION__
"
(), can't get iobase of 0x%03x
\n
"
,
self
->
io
.
sir_base
);
IRDA_DEBUG
(
0
,
"%s
(), can't get iobase of 0x%03x
\n
"
,
__FUNCTION__
,
self
->
io
.
sir_base
);
return
NULL
;
}
...
...
@@ -212,7 +212,7 @@ irport_open(int i, unsigned int iobase, unsigned int irq)
self
->
mode
=
IRDA_IRLAP
;
if
(
!
(
dev
=
dev_alloc
(
"irda%d"
,
&
err
)))
{
ERROR
(
__FUNCTION__
"(), dev_alloc() failed!
\n
"
);
ERROR
(
"%s(), dev_alloc() failed!
\n
"
,
__FUNCTION__
);
return
NULL
;
}
self
->
netdev
=
dev
;
...
...
@@ -240,7 +240,7 @@ irport_open(int i, unsigned int iobase, unsigned int irq)
err
=
register_netdevice
(
dev
);
rtnl_unlock
();
if
(
err
)
{
ERROR
(
__FUNCTION__
"(), register_netdev() failed!
\n
"
);
ERROR
(
"%s(), register_netdev() failed!
\n
"
,
__FUNCTION__
);
return
NULL
;
}
MESSAGE
(
"IrDA: Registered device %s
\n
"
,
dev
->
name
);
...
...
@@ -265,8 +265,8 @@ int irport_close(struct irport_cb *self)
}
/* Release the IO-port that this driver is using */
IRDA_DEBUG
(
0
,
__FUNCTION__
"
(), Releasing Region %03x
\n
"
,
self
->
io
.
sir_base
);
IRDA_DEBUG
(
0
,
"%s
(), Releasing Region %03x
\n
"
,
__FUNCTION__
,
self
->
io
.
sir_base
);
release_region
(
self
->
io
.
sir_base
,
self
->
io
.
sir_ext
);
if
(
self
->
tx_buff
.
head
)
...
...
@@ -323,7 +323,7 @@ void irport_stop(struct irport_cb *self)
*/
int
irport_probe
(
int
iobase
)
{
IRDA_DEBUG
(
4
,
__FUNCTION__
"(), iobase=%#x
\n
"
,
iobase
);
IRDA_DEBUG
(
4
,
"%s(), iobase=%#x
\n
"
,
__FUNCTION__
,
iobase
);
return
0
;
}
...
...
@@ -402,7 +402,7 @@ int __irport_change_speed(struct irda_task *task)
int
wasunlocked
=
0
;
int
ret
=
0
;
IRDA_DEBUG
(
2
,
__FUNCTION__
"(), <%ld>
\n
"
,
jiffies
);
IRDA_DEBUG
(
2
,
"%s(), <%ld>
\n
"
,
__FUNCTION__
,
jiffies
);
self
=
(
struct
irport_cb
*
)
task
->
instance
;
...
...
@@ -455,8 +455,7 @@ int __irport_change_speed(struct irda_task *task)
irda_task_next_state
(
task
,
IRDA_TASK_CHILD_DONE
);
break
;
case
IRDA_TASK_CHILD_WAIT
:
WARNING
(
__FUNCTION__
"(), changing speed of dongle timed out!
\n
"
);
WARNING
(
"%s(), changing speed of dongle timed out!
\n
"
,
__FUNCTION__
);
ret
=
-
1
;
break
;
case
IRDA_TASK_CHILD_DONE
:
...
...
@@ -466,7 +465,7 @@ int __irport_change_speed(struct irda_task *task)
irda_task_next_state
(
task
,
IRDA_TASK_DONE
);
break
;
default:
ERROR
(
__FUNCTION__
"(), unknown state %d
\n
"
,
task
->
state
);
ERROR
(
"%s(), unknown state %d
\n
"
,
__FUNCTION__
,
task
->
state
);
irda_task_next_state
(
task
,
IRDA_TASK_DONE
);
ret
=
-
1
;
break
;
...
...
@@ -494,7 +493,7 @@ static void irport_write_wakeup(struct irport_cb *self)
ASSERT
(
self
!=
NULL
,
return
;);
IRDA_DEBUG
(
4
,
__FUNCTION__
"()
\n
"
);
IRDA_DEBUG
(
4
,
"%s()
\n
"
,
__FUNCTION__
);
iobase
=
self
->
io
.
sir_base
;
...
...
@@ -556,7 +555,7 @@ static int irport_write(int iobase, int fifo_size, __u8 *buf, int len)
/* Tx FIFO should be empty! */
if
(
!
(
inb
(
iobase
+
UART_LSR
)
&
UART_LSR_THRE
))
{
IRDA_DEBUG
(
0
,
__FUNCTION__
"(), failed, fifo not empty!
\n
"
);
IRDA_DEBUG
(
0
,
"%s(), failed, fifo not empty!
\n
"
,
__FUNCTION__
);
return
0
;
}
...
...
@@ -581,7 +580,7 @@ static int irport_change_speed_complete(struct irda_task *task)
{
struct
irport_cb
*
self
;
IRDA_DEBUG
(
1
,
__FUNCTION__
"()
\n
"
);
IRDA_DEBUG
(
1
,
"%s()
\n
"
,
__FUNCTION__
);
self
=
(
struct
irport_cb
*
)
task
->
instance
;
...
...
@@ -638,7 +637,7 @@ int irport_hard_xmit(struct sk_buff *skb, struct net_device *dev)
int
iobase
;
s32
speed
;
IRDA_DEBUG
(
1
,
__FUNCTION__
"()
\n
"
);
IRDA_DEBUG
(
1
,
"%s()
\n
"
,
__FUNCTION__
);
ASSERT
(
dev
!=
NULL
,
return
0
;);
...
...
@@ -712,7 +711,7 @@ static void irport_receive(struct irport_cb *self)
/* Make sure we don't stay here to long */
if
(
boguscount
++
>
32
)
{
IRDA_DEBUG
(
2
,
__FUNCTION__
"(), breaking!
\n
"
);
IRDA_DEBUG
(
2
,
"%s(), breaking!
\n
"
,
__FUNCTION__
);
break
;
}
}
while
(
inb
(
iobase
+
UART_LSR
)
&
UART_LSR_DR
);
...
...
@@ -732,7 +731,7 @@ void irport_interrupt(int irq, void *dev_id, struct pt_regs *regs)
int
iir
,
lsr
;
if
(
!
dev
)
{
WARNING
(
__FUNCTION__
"() irq %d for unknown device.
\n
"
,
irq
);
WARNING
(
"%s() irq %d for unknown device.
\n
"
,
__FUNCTION__
,
irq
);
return
;
}
self
=
(
struct
irport_cb
*
)
dev
->
priv
;
...
...
@@ -746,13 +745,12 @@ void irport_interrupt(int irq, void *dev_id, struct pt_regs *regs)
/* Clear interrupt */
lsr
=
inb
(
iobase
+
UART_LSR
);
IRDA_DEBUG
(
4
,
__FUNCTION__
"(), iir=%02x, lsr=%02x, iobase=%#x
\n
"
,
iir
,
lsr
,
iobase
);
IRDA_DEBUG
(
4
,
"%s(), iir=%02x, lsr=%02x, iobase=%#x
\n
"
,
__FUNCTION__
,
iir
,
lsr
,
iobase
);
switch
(
iir
)
{
case
UART_IIR_RLSI
:
IRDA_DEBUG
(
2
,
__FUNCTION__
"(), RLSI
\n
"
);
IRDA_DEBUG
(
2
,
"%s(), RLSI
\n
"
,
__FUNCTION__
);
break
;
case
UART_IIR_RDI
:
/* Receive interrupt */
...
...
@@ -764,7 +762,7 @@ void irport_interrupt(int irq, void *dev_id, struct pt_regs *regs)
irport_write_wakeup
(
self
);
break
;
default:
IRDA_DEBUG
(
0
,
__FUNCTION__
"(), unhandled IIR=%#x
\n
"
,
iir
);
IRDA_DEBUG
(
0
,
"%s(), unhandled IIR=%#x
\n
"
,
__FUNCTION__
,
iir
);
break
;
}
...
...
@@ -800,7 +798,7 @@ int irport_net_open(struct net_device *dev)
char
hwname
[
16
];
unsigned
long
flags
;
IRDA_DEBUG
(
1
,
__FUNCTION__
"()
\n
"
);
IRDA_DEBUG
(
1
,
"%s()
\n
"
,
__FUNCTION__
);
ASSERT
(
dev
!=
NULL
,
return
-
1
;);
self
=
(
struct
irport_cb
*
)
dev
->
priv
;
...
...
@@ -809,8 +807,8 @@ int irport_net_open(struct net_device *dev)
if
(
request_irq
(
self
->
io
.
irq
,
self
->
interrupt
,
0
,
dev
->
name
,
(
void
*
)
dev
))
{
IRDA_DEBUG
(
0
,
__FUNCTION__
"
(), unable to allocate irq=%d
\n
"
,
self
->
io
.
irq
);
IRDA_DEBUG
(
0
,
"%s
(), unable to allocate irq=%d
\n
"
,
__FUNCTION__
,
self
->
io
.
irq
);
return
-
EAGAIN
;
}
...
...
@@ -850,7 +848,7 @@ int irport_net_close(struct net_device *dev)
int
iobase
;
unsigned
long
flags
;
IRDA_DEBUG
(
4
,
__FUNCTION__
"()
\n
"
);
IRDA_DEBUG
(
4
,
"%s()
\n
"
,
__FUNCTION__
);
ASSERT
(
dev
!=
NULL
,
return
-
1
;);
self
=
(
struct
irport_cb
*
)
dev
->
priv
;
...
...
@@ -893,7 +891,7 @@ void irport_wait_until_sent(struct irport_cb *self)
/* Wait until Tx FIFO is empty */
while (!(inb(iobase+UART_LSR) & UART_LSR_THRE)) {
IRDA_DEBUG(2,
__FUNCTION__ "(), waiting!\n"
);
IRDA_DEBUG(2,
"%s(), waiting!\n", __FUNCTION__
);
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(MSECS_TO_JIFFIES(60));
}
...
...
@@ -948,7 +946,7 @@ static int irport_raw_write(struct net_device *dev, __u8 *buf, int len)
/* Tx FIFO should be empty! */
if
(
!
(
inb
(
iobase
+
UART_LSR
)
&
UART_LSR_THRE
))
{
IRDA_DEBUG
(
0
,
__FUNCTION__
"(), failed, fifo not empty!
\n
"
);
IRDA_DEBUG
(
0
,
"%s(), failed, fifo not empty!
\n
"
,
__FUNCTION__
);
return
-
1
;
}
...
...
@@ -982,7 +980,7 @@ static int irport_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
);
switch
(
cmd
)
{
case
SIOCSBANDWIDTH
:
/* Set bandwidth */
...
...
drivers/net/irda/irtty.c
View file @
16f0fbb6
...
...
@@ -120,9 +120,8 @@ static void __exit irtty_cleanup(void)
/* Unregister tty line-discipline */
if
((
ret
=
tty_register_ldisc
(
N_IRDA
,
NULL
)))
{
ERROR
(
__FUNCTION__
"(), can't unregister line discipline (err = %d)
\n
"
,
ret
);
ERROR
(
"%s(), can't unregister line discipline (err = %d)
\n
"
,
__FUNCTION__
,
ret
);
}
/*
...
...
@@ -229,7 +228,7 @@ static int irtty_open(struct tty_struct *tty)
self
->
rx_buff
.
data
=
self
->
rx_buff
.
head
;
if
(
!
(
dev
=
dev_alloc
(
"irda%d"
,
&
err
)))
{
ERROR
(
__FUNCTION__
"(), dev_alloc() failed!
\n
"
);
ERROR
(
"%s(), dev_alloc() failed!
\n
"
,
__FUNCTION__
);
return
-
ENOMEM
;
}
...
...
@@ -248,7 +247,7 @@ static int irtty_open(struct tty_struct *tty)
err
=
register_netdevice
(
dev
);
rtnl_unlock
();
if
(
err
)
{
ERROR
(
__FUNCTION__
"(), register_netdev() failed!
\n
"
);
ERROR
(
"%s(), register_netdev() failed!
\n
"
,
__FUNCTION__
);
return
-
1
;
}
...
...
@@ -467,8 +466,7 @@ static int irtty_change_speed(struct irda_task *task)
irda_task_next_state
(
task
,
IRDA_TASK_CHILD_DONE
);
break
;
case
IRDA_TASK_CHILD_WAIT
:
WARNING
(
__FUNCTION__
"(), changing speed of dongle timed out!
\n
"
);
WARNING
(
"%s(), changing speed of dongle timed out!
\n
"
,
__FUNCTION__
);
ret
=
-
1
;
break
;
case
IRDA_TASK_CHILD_DONE
:
...
...
@@ -479,7 +477,7 @@ static int irtty_change_speed(struct irda_task *task)
self
->
task
=
NULL
;
break
;
default:
ERROR
(
__FUNCTION__
"(), unknown state %d
\n
"
,
task
->
state
);
ERROR
(
"%s(), unknown state %d
\n
"
,
__FUNCTION__
,
task
->
state
);
irda_task_next_state
(
task
,
IRDA_TASK_DONE
);
self
->
task
=
NULL
;
ret
=
-
1
;
...
...
drivers/net/irda/mcp2120.c
View file @
16f0fbb6
...
...
@@ -109,7 +109,7 @@ static int mcp2120_change_speed(struct irda_task *task)
}
break
;
case
IRDA_TASK_CHILD_WAIT
:
WARNING
(
__FUNCTION__
"(), resetting dongle timed out!
\n
"
);
WARNING
(
"%s(), resetting dongle timed out!
\n
"
,
__FUNCTION__
);
ret
=
-
1
;
break
;
case
IRDA_TASK_CHILD_DONE
:
...
...
@@ -157,7 +157,7 @@ static int mcp2120_change_speed(struct irda_task *task)
//printk("mcp2120_change_speed irda_task_wait\n");
break
;
default:
ERROR
(
__FUNCTION__
"(), unknown state %d
\n
"
,
task
->
state
);
ERROR
(
"%s(), unknown state %d
\n
"
,
__FUNCTION__
,
task
->
state
);
irda_task_next_state
(
task
,
IRDA_TASK_DONE
);
self
->
speed_task
=
NULL
;
ret
=
-
1
;
...
...
@@ -212,7 +212,7 @@ static int mcp2120_reset(struct irda_task *task)
self
->
reset_task
=
NULL
;
break
;
default:
ERROR
(
__FUNCTION__
"(), unknown state %d
\n
"
,
task
->
state
);
ERROR
(
"%s(), unknown state %d
\n
"
,
__FUNCTION__
,
task
->
state
);
irda_task_next_state
(
task
,
IRDA_TASK_DONE
);
self
->
reset_task
=
NULL
;
ret
=
-
1
;
...
...
drivers/net/irda/nsc-ircc.c
View file @
16f0fbb6
This diff is collapsed.
Click to expand it.
drivers/net/irda/smc-ircc.c
View file @
16f0fbb6
...
...
@@ -949,14 +949,14 @@ static void ircc_dma_receive_complete(struct ircc_cb *self, int iobase)
len
-=
4
;
if
((
len
<
2
)
||
(
len
>
2050
))
{
WARNING
(
__FUNCTION__
"(), bogus len=%d
\n
"
,
len
);
WARNING
(
"%s(), bogus len=%d
\n
"
,
__FUNCTION__
,
len
);
return
;
}
IRDA_DEBUG
(
2
,
__FUNCTION__
": msgcnt = %d, len=%d
\n
"
,
msgcnt
,
len
);
skb
=
dev_alloc_skb
(
len
+
1
);
if
(
!
skb
)
{
WARNING
(
__FUNCTION__
"(), memory squeeze, dropping frame.
\n
"
);
WARNING
(
"%s(), memory squeeze, dropping frame.
\n
"
,
__FUNCTION__
);
return
;
}
/* Make sure IP header gets aligned */
...
...
@@ -1086,7 +1086,7 @@ static int ircc_net_open(struct net_device *dev)
if
(
request_dma
(
self
->
io
->
dma
,
dev
->
name
))
{
irport_net_close
(
dev
);
WARNING
(
__FUNCTION__
"(), unable to allocate DMA=%d
\n
"
,
self
->
io
->
dma
);
WARNING
(
"%s(), unable to allocate DMA=%d
\n
"
,
__FUNCTION__
,
self
->
io
->
dma
);
return
-
EAGAIN
;
}
...
...
@@ -1107,7 +1107,7 @@ static int ircc_net_close(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
;
...
...
drivers/net/irda/tekram.c
View file @
16f0fbb6
...
...
@@ -161,7 +161,7 @@ static int tekram_change_speed(struct irda_task *task)
irda_task_next_state
(
task
,
IRDA_TASK_CHILD_DONE
);
break
;
case
IRDA_TASK_CHILD_WAIT
:
WARNING
(
__FUNCTION__
"(), resetting dongle timed out!
\n
"
);
WARNING
(
"%s(), resetting dongle timed out!
\n
"
,
__FUNCTION__
);
ret
=
-
1
;
break
;
case
IRDA_TASK_CHILD_DONE
:
...
...
@@ -187,7 +187,7 @@ static int tekram_change_speed(struct irda_task *task)
self
->
speed_task
=
NULL
;
break
;
default:
ERROR
(
__FUNCTION__
"(), unknown state %d
\n
"
,
task
->
state
);
ERROR
(
"%s(), unknown state %d
\n
"
,
__FUNCTION__
,
task
->
state
);
irda_task_next_state
(
task
,
IRDA_TASK_DONE
);
self
->
speed_task
=
NULL
;
ret
=
-
1
;
...
...
@@ -255,7 +255,7 @@ int tekram_reset(struct irda_task *task)
self
->
reset_task
=
NULL
;
break
;
default:
ERROR
(
__FUNCTION__
"(), unknown state %d
\n
"
,
task
->
state
);
ERROR
(
"%s(), unknown state %d
\n
"
,
__FUNCTION__
,
task
->
state
);
irda_task_next_state
(
task
,
IRDA_TASK_DONE
);
self
->
reset_task
=
NULL
;
ret
=
-
1
;
...
...
drivers/net/irda/toshoboe.c
View file @
16f0fbb6
...
...
@@ -421,8 +421,8 @@ toshoboe_interrupt (int irq, void *dev_id, struct pt_regs *regs)
}
else
{
printk
(
KERN_INFO
__FUNCTION__
"
(), memory squeeze, dropping frame.
\n
"
);
printk
(
KERN_INFO
"
%s(), memory squeeze, dropping frame.
\n
"
,
__FUNCTION__
);
}
self
->
taskfile
->
recv
[
self
->
rxs
].
control
=
0x83
;
...
...
@@ -824,7 +824,7 @@ toshoboe_probe (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
if
(
!
(
dev
=
dev_alloc
(
"irda%d"
,
&
err
)))
{
ERROR
(
__FUNCTION__
"(), dev_alloc() failed!
\n
"
);
ERROR
(
"%s(), dev_alloc() failed!
\n
"
,
__FUNCTION__
);
err
=
-
ENOMEM
;
goto
freebufs
;
}
...
...
@@ -843,7 +843,7 @@ toshoboe_probe (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
err
=
register_netdevice
(
dev
);
rtnl_unlock
();
if
(
err
)
{
ERROR
(
__FUNCTION__
"(), register_netdev() failed!
\n
"
);
ERROR
(
"%s(), register_netdev() failed!
\n
"
,
__FUNCTION__
);
/* XXX there is not freeing for dev? */
goto
freebufs
;
}
...
...
drivers/net/irda/w83977af_ir.c
View file @
16f0fbb6
...
...
@@ -237,7 +237,7 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq,
self
->
rx_buff
.
data
=
self
->
rx_buff
.
head
;
if
(
!
(
dev
=
dev_alloc
(
"irda%d"
,
&
err
)))
{
ERROR
(
__FUNCTION__
"(), dev_alloc() failed!
\n
"
);
ERROR
(
"%s(), dev_alloc() failed!
\n
"
,
__FUNCTION__
);
return
-
ENOMEM
;
}
dev
->
priv
=
(
void
*
)
self
;
...
...
@@ -255,7 +255,7 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq,
err
=
register_netdevice
(
dev
);
rtnl_unlock
();
if
(
err
)
{
ERROR
(
__FUNCTION__
"(), register_netdevice() failed!
\n
"
);
ERROR
(
"%s(), register_netdevice() failed!
\n
"
,
__FUNCTION__
);
return
-
1
;
}
MESSAGE
(
"IrDA: Registered device %s
\n
"
,
dev
->
name
);
...
...
@@ -891,8 +891,8 @@ int w83977af_dma_receive_complete(struct w83977af_ir *self)
skb
=
dev_alloc_skb
(
len
+
1
);
if
(
skb
==
NULL
)
{
printk
(
KERN_INFO
__FUNCTION__
"
(), memory squeeze, dropping frame.
\n
"
);
printk
(
KERN_INFO
"
%s(), memory squeeze, dropping frame.
\n
"
,
__FUNCTION__
);
/* Restore set register */
outb
(
set
,
iobase
+
SSR
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment