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
nexedi
linux
Commits
297e2507
Commit
297e2507
authored
Jan 03, 2003
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Plain Diff
Merge redhat.com:/home/jgarzik/repo/linus-2.5
into redhat.com:/home/jgarzik/repo/irda-2.5
parents
2622cf1d
b37445bd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
19 deletions
+15
-19
drivers/net/irda/ali-ircc.c
drivers/net/irda/ali-ircc.c
+3
-4
drivers/net/irda/donauboe.c
drivers/net/irda/donauboe.c
+3
-4
drivers/net/irda/irda-usb.c
drivers/net/irda/irda-usb.c
+3
-3
drivers/net/irda/nsc-ircc.c
drivers/net/irda/nsc-ircc.c
+3
-4
drivers/net/irda/w83977af_ir.c
drivers/net/irda/w83977af_ir.c
+3
-4
No files found.
drivers/net/irda/ali-ircc.c
View file @
297e2507
...
...
@@ -1303,6 +1303,9 @@ static int ali_ircc_net_init(struct net_device *dev)
{
IRDA_DEBUG
(
2
,
"%s(), ---------------- Start ----------------
\n
"
,
__FUNCTION__
);
/* Keep track of module usage */
SET_MODULE_OWNER
(
dev
);
/* Setup to be a normal IrDA network device driver */
irda_device_setup
(
dev
);
...
...
@@ -1369,8 +1372,6 @@ static int ali_ircc_net_open(struct net_device *dev)
*/
self
->
irlap
=
irlap_open
(
dev
,
&
self
->
qos
,
hwname
);
MOD_INC_USE_COUNT
;
IRDA_DEBUG
(
2
,
"%s(), ----------------- End ------------------
\n
"
,
__FUNCTION__
);
return
0
;
...
...
@@ -1411,8 +1412,6 @@ static int ali_ircc_net_close(struct net_device *dev)
free_irq
(
self
->
io
.
irq
,
dev
);
free_dma
(
self
->
io
.
dma
);
MOD_DEC_USE_COUNT
;
IRDA_DEBUG
(
2
,
"%s(), ----------------- End ------------------
\n
"
,
__FUNCTION__
);
return
0
;
...
...
drivers/net/irda/donauboe.c
View file @
297e2507
...
...
@@ -1388,6 +1388,9 @@ toshoboe_net_init (struct net_device *dev)
{
IRDA_DEBUG
(
4
,
"%s()
\n
"
,
__FUNCTION__
);
/* Keep track of module usage */
SET_MODULE_OWNER
(
dev
);
/* Setup to be a normal IrDA network device driver */
irda_device_setup
(
dev
);
...
...
@@ -1435,8 +1438,6 @@ toshoboe_net_open (struct net_device *dev)
self
->
irdad
=
1
;
MOD_INC_USE_COUNT
;
return
0
;
}
...
...
@@ -1467,8 +1468,6 @@ toshoboe_net_close (struct net_device *dev)
toshoboe_stopchip
(
self
);
}
MOD_DEC_USE_COUNT
;
return
0
;
}
...
...
drivers/net/irda/irda-usb.c
View file @
297e2507
...
...
@@ -904,6 +904,9 @@ static int irda_usb_net_init(struct net_device *dev)
{
IRDA_DEBUG
(
1
,
"%s()
\n
"
,
__FUNCTION__
);
/* Keep track of module usage */
SET_MODULE_OWNER
(
dev
);
/* Set up to be a normal IrDA network device driver */
irda_device_setup
(
dev
);
...
...
@@ -974,7 +977,6 @@ static int irda_usb_net_open(struct net_device *netdev)
irda_usb_submit
(
self
,
NULL
,
self
->
rx_urb
[
i
]);
/* Ready to play !!! */
MOD_INC_USE_COUNT
;
return
0
;
}
...
...
@@ -1026,8 +1028,6 @@ static int irda_usb_net_close(struct net_device *netdev)
irlap_close
(
self
->
irlap
);
self
->
irlap
=
NULL
;
MOD_DEC_USE_COUNT
;
return
0
;
}
...
...
drivers/net/irda/nsc-ircc.c
View file @
297e2507
...
...
@@ -1866,6 +1866,9 @@ static int nsc_ircc_net_init(struct net_device *dev)
{
IRDA_DEBUG
(
4
,
"%s()
\n
"
,
__FUNCTION__
);
/* Keep track of module usage */
SET_MODULE_OWNER
(
dev
);
/* Setup to be a normal IrDA network device driver */
irda_device_setup
(
dev
);
...
...
@@ -1934,8 +1937,6 @@ static int nsc_ircc_net_open(struct net_device *dev)
*/
self
->
irlap
=
irlap_open
(
dev
,
&
self
->
qos
,
hwname
);
MOD_INC_USE_COUNT
;
return
0
;
}
...
...
@@ -1983,8 +1984,6 @@ static int nsc_ircc_net_close(struct net_device *dev)
/* Restore bank register */
outb
(
bank
,
iobase
+
BSR
);
MOD_DEC_USE_COUNT
;
return
0
;
}
...
...
drivers/net/irda/w83977af_ir.c
View file @
297e2507
...
...
@@ -1197,6 +1197,9 @@ static int w83977af_net_init(struct net_device *dev)
{
IRDA_DEBUG
(
0
,
"%s()
\n
"
,
__FUNCTION__
);
/* Keep track of module usage */
SET_MODULE_OWNER
(
dev
);
/* Set up to be a normal IrDA network device driver */
irda_device_setup
(
dev
);
...
...
@@ -1267,8 +1270,6 @@ static int w83977af_net_open(struct net_device *dev)
*/
self
->
irlap
=
irlap_open
(
dev
,
&
self
->
qos
,
hwname
);
MOD_INC_USE_COUNT
;
return
0
;
}
...
...
@@ -1317,8 +1318,6 @@ static int w83977af_net_close(struct net_device *dev)
/* Restore bank register */
outb
(
set
,
iobase
+
SSR
);
MOD_DEC_USE_COUNT
;
return
0
;
}
...
...
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