diff options
Diffstat (limited to 'drivers/net/macb.c')
-rw-r--r-- | drivers/net/macb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index bd0ce98c939c..3496d19c55e1 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c | |||
@@ -267,9 +267,9 @@ static void macb_update_stats(struct macb *bp) | |||
267 | *p += readl(reg); | 267 | *p += readl(reg); |
268 | } | 268 | } |
269 | 269 | ||
270 | static void macb_periodic_task(void *arg) | 270 | static void macb_periodic_task(struct work_struct *work) |
271 | { | 271 | { |
272 | struct macb *bp = arg; | 272 | struct macb *bp = container_of(work, struct macb, periodic_task.work); |
273 | 273 | ||
274 | macb_update_stats(bp); | 274 | macb_update_stats(bp); |
275 | macb_check_media(bp, 1, 0); | 275 | macb_check_media(bp, 1, 0); |
@@ -1088,7 +1088,7 @@ static int __devinit macb_probe(struct platform_device *pdev) | |||
1088 | 1088 | ||
1089 | dev->base_addr = regs->start; | 1089 | dev->base_addr = regs->start; |
1090 | 1090 | ||
1091 | INIT_WORK(&bp->periodic_task, macb_periodic_task, bp); | 1091 | INIT_DELAYED_WORK(&bp->periodic_task, macb_periodic_task); |
1092 | mutex_init(&bp->mdio_mutex); | 1092 | mutex_init(&bp->mdio_mutex); |
1093 | init_completion(&bp->mdio_complete); | 1093 | init_completion(&bp->mdio_complete); |
1094 | 1094 | ||