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
0c18acc1
Commit
0c18acc1
authored
Mar 09, 2012
by
Francois Romieu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
yellowfin: stop using net_device.{base_addr, irq}.
Signed-off-by:
Francois Romieu
<
romieu@fr.zoreil.com
>
parent
a69afe32
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
18 deletions
+14
-18
drivers/net/ethernet/packetengines/yellowfin.c
drivers/net/ethernet/packetengines/yellowfin.c
+14
-18
No files found.
drivers/net/ethernet/packetengines/yellowfin.c
View file @
0c18acc1
...
...
@@ -427,9 +427,6 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev,
/* Reset the chip. */
iowrite32
(
0x80000000
,
ioaddr
+
DMACtrl
);
dev
->
base_addr
=
(
unsigned
long
)
ioaddr
;
dev
->
irq
=
irq
;
pci_set_drvdata
(
pdev
,
dev
);
spin_lock_init
(
&
np
->
lock
);
...
...
@@ -569,25 +566,20 @@ static void mdio_write(void __iomem *ioaddr, int phy_id, int location, int value
static
int
yellowfin_open
(
struct
net_device
*
dev
)
{
struct
yellowfin_private
*
yp
=
netdev_priv
(
dev
);
const
int
irq
=
yp
->
pci_dev
->
irq
;
void
__iomem
*
ioaddr
=
yp
->
base
;
int
i
,
r
et
;
int
i
,
r
c
;
/* Reset the chip. */
iowrite32
(
0x80000000
,
ioaddr
+
DMACtrl
);
ret
=
request_irq
(
dev
->
irq
,
yellowfin_interrupt
,
IRQF_SHARED
,
dev
->
name
,
dev
);
if
(
ret
)
return
ret
;
if
(
yellowfin_debug
>
1
)
netdev_printk
(
KERN_DEBUG
,
dev
,
"%s() irq %d
\n
"
,
__func__
,
dev
->
irq
);
rc
=
request_irq
(
irq
,
yellowfin_interrupt
,
IRQF_SHARED
,
dev
->
name
,
dev
);
if
(
rc
)
return
rc
;
ret
=
yellowfin_init_ring
(
dev
);
if
(
ret
)
{
free_irq
(
dev
->
irq
,
dev
);
return
ret
;
}
rc
=
yellowfin_init_ring
(
dev
);
if
(
rc
<
0
)
goto
err_free_irq
;
iowrite32
(
yp
->
rx_ring_dma
,
ioaddr
+
RxPtr
);
iowrite32
(
yp
->
tx_ring_dma
,
ioaddr
+
TxPtr
);
...
...
@@ -647,8 +639,12 @@ static int yellowfin_open(struct net_device *dev)
yp
->
timer
.
data
=
(
unsigned
long
)
dev
;
yp
->
timer
.
function
=
yellowfin_timer
;
/* timer handler */
add_timer
(
&
yp
->
timer
);
out:
return
rc
;
return
0
;
err_free_irq:
free_irq
(
irq
,
dev
);
goto
out
;
}
static
void
yellowfin_timer
(
unsigned
long
data
)
...
...
@@ -1251,7 +1247,7 @@ static int yellowfin_close(struct net_device *dev)
}
#endif
/* __i386__ debugging only */
free_irq
(
dev
->
irq
,
dev
);
free_irq
(
yp
->
pci_
dev
->
irq
,
dev
);
/* Free all the skbuffs in the Rx queue. */
for
(
i
=
0
;
i
<
RX_RING_SIZE
;
i
++
)
{
...
...
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