projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cfq-iosched: remove cfq_io_context last_queue
[powerpc.git]
/
drivers
/
net
/
tulip
/
timer.c
diff --git
a/drivers/net/tulip/timer.c
b/drivers/net/tulip/timer.c
index
066e5d6
..
df326fe
100644
(file)
--- a/
drivers/net/tulip/timer.c
+++ b/
drivers/net/tulip/timer.c
@@
-18,10
+18,11
@@
#include "tulip.h"
#include "tulip.h"
-void tulip_media_task(
void *data
)
+void tulip_media_task(
struct work_struct *work
)
{
{
- struct net_device *dev = data;
- struct tulip_private *tp = netdev_priv(dev);
+ struct tulip_private *tp =
+ container_of(work, struct tulip_private, media_work);
+ struct net_device *dev = tp->dev;
void __iomem *ioaddr = tp->base_addr;
u32 csr12 = ioread32(ioaddr + CSR12);
int next_tick = 2*HZ;
void __iomem *ioaddr = tp->base_addr;
u32 csr12 = ioread32(ioaddr + CSR12);
int next_tick = 2*HZ;