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
03a2384e
Commit
03a2384e
authored
Mar 09, 2012
by
Francois Romieu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
forcedeth: stop using net_device.{base_addr, irq}.
Signed-off-by:
Francois Romieu
<
romieu@fr.zoreil.com
>
parent
9195182d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
5 deletions
+0
-5
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/ethernet/nvidia/forcedeth.c
+0
-5
No files found.
drivers/net/ethernet/nvidia/forcedeth.c
View file @
03a2384e
...
@@ -3943,13 +3943,11 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
...
@@ -3943,13 +3943,11 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
ret
=
pci_enable_msi
(
np
->
pci_dev
);
ret
=
pci_enable_msi
(
np
->
pci_dev
);
if
(
ret
==
0
)
{
if
(
ret
==
0
)
{
np
->
msi_flags
|=
NV_MSI_ENABLED
;
np
->
msi_flags
|=
NV_MSI_ENABLED
;
dev
->
irq
=
np
->
pci_dev
->
irq
;
if
(
request_irq
(
np
->
pci_dev
->
irq
,
handler
,
IRQF_SHARED
,
dev
->
name
,
dev
)
!=
0
)
{
if
(
request_irq
(
np
->
pci_dev
->
irq
,
handler
,
IRQF_SHARED
,
dev
->
name
,
dev
)
!=
0
)
{
netdev_info
(
dev
,
"request_irq failed %d
\n
"
,
netdev_info
(
dev
,
"request_irq failed %d
\n
"
,
ret
);
ret
);
pci_disable_msi
(
np
->
pci_dev
);
pci_disable_msi
(
np
->
pci_dev
);
np
->
msi_flags
&=
~
NV_MSI_ENABLED
;
np
->
msi_flags
&=
~
NV_MSI_ENABLED
;
dev
->
irq
=
np
->
pci_dev
->
irq
;
goto
out_err
;
goto
out_err
;
}
}
...
@@ -5650,9 +5648,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
...
@@ -5650,9 +5648,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
np
->
base
=
ioremap
(
addr
,
np
->
register_size
);
np
->
base
=
ioremap
(
addr
,
np
->
register_size
);
if
(
!
np
->
base
)
if
(
!
np
->
base
)
goto
out_relreg
;
goto
out_relreg
;
dev
->
base_addr
=
(
unsigned
long
)
np
->
base
;
dev
->
irq
=
pci_dev
->
irq
;
np
->
rx_ring_size
=
RX_RING_DEFAULT
;
np
->
rx_ring_size
=
RX_RING_DEFAULT
;
np
->
tx_ring_size
=
TX_RING_DEFAULT
;
np
->
tx_ring_size
=
TX_RING_DEFAULT
;
...
...
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