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
0ca0aa08
Commit
0ca0aa08
authored
Mar 09, 2012
by
Francois Romieu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hamachi: stop using net_device.{base_addr, irq}.
Signed-off-by:
Francois Romieu
<
romieu@fr.zoreil.com
>
parent
05d334ec
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
8 deletions
+3
-8
drivers/net/ethernet/packetengines/hamachi.c
drivers/net/ethernet/packetengines/hamachi.c
+3
-8
No files found.
drivers/net/ethernet/packetengines/hamachi.c
View file @
0ca0aa08
...
@@ -683,8 +683,6 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
...
@@ -683,8 +683,6 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
}
}
hmp
->
base
=
ioaddr
;
hmp
->
base
=
ioaddr
;
dev
->
base_addr
=
(
unsigned
long
)
ioaddr
;
dev
->
irq
=
irq
;
pci_set_drvdata
(
pdev
,
dev
);
pci_set_drvdata
(
pdev
,
dev
);
hmp
->
chip_id
=
chip_id
;
hmp
->
chip_id
=
chip_id
;
...
@@ -859,14 +857,11 @@ static int hamachi_open(struct net_device *dev)
...
@@ -859,14 +857,11 @@ static int hamachi_open(struct net_device *dev)
u32
rx_int_var
,
tx_int_var
;
u32
rx_int_var
,
tx_int_var
;
u16
fifo_info
;
u16
fifo_info
;
i
=
request_irq
(
dev
->
irq
,
hamachi_interrupt
,
IRQF_SHARED
,
dev
->
name
,
dev
);
i
=
request_irq
(
hmp
->
pci_dev
->
irq
,
hamachi_interrupt
,
IRQF_SHARED
,
dev
->
name
,
dev
);
if
(
i
)
if
(
i
)
return
i
;
return
i
;
if
(
hamachi_debug
>
1
)
printk
(
KERN_DEBUG
"%s: hamachi_open() irq %d.
\n
"
,
dev
->
name
,
dev
->
irq
);
hamachi_init_ring
(
dev
);
hamachi_init_ring
(
dev
);
#if ADDRLEN == 64
#if ADDRLEN == 64
...
@@ -1705,7 +1700,7 @@ static int hamachi_close(struct net_device *dev)
...
@@ -1705,7 +1700,7 @@ static int hamachi_close(struct net_device *dev)
}
}
#endif
/* __i386__ debugging only */
#endif
/* __i386__ debugging only */
free_irq
(
dev
->
irq
,
dev
);
free_irq
(
hmp
->
pci_
dev
->
irq
,
dev
);
del_timer_sync
(
&
hmp
->
timer
);
del_timer_sync
(
&
hmp
->
timer
);
...
...
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