---

yaml --- r: 44179 b: refs/heads/master c: d836cae h: refs/heads/master i: 44177: 6a91ab6 44175: a9d33bc v: v3
git-mirror · Dec 11, 2006 · f1045dd · f1045dd
1 parent edacd76
commit f1045dd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68dc44af632944dff6c8b36013d32a254fe62de4
+refs/heads/master: d836cae4f683211f14c1fd8184f478622b185164
diff --git a/trunk/drivers/net/macb.c b/trunk/drivers/net/macb.c
@@ -267,9 +267,9 @@ static void macb_update_stats(struct macb *bp)
 		*p += readl(reg);
 }
 
-static void macb_periodic_task(void *arg)
+static void macb_periodic_task(struct work_struct *work)
 {
-	struct macb *bp = arg;
+	struct macb *bp = container_of(work, struct macb, periodic_task.work);
 
 	macb_update_stats(bp);
 	macb_check_media(bp, 1, 0);
@@ -1088,7 +1088,7 @@ static int __devinit macb_probe(struct platform_device *pdev)
 
 	dev->base_addr = regs->start;
 
-	INIT_WORK(&bp->periodic_task, macb_periodic_task, bp);
+	INIT_DELAYED_WORK(&bp->periodic_task, macb_periodic_task);
 	mutex_init(&bp->mdio_mutex);
 	init_completion(&bp->mdio_complete);
 

diff --git a/trunk/drivers/net/macb.h b/trunk/drivers/net/macb.h
@@ -377,7 +377,7 @@ struct macb {
 
 	unsigned int		rx_pending, tx_pending;
 
-	struct work_struct	periodic_task;
+	struct delayed_work	periodic_task;
 
 	struct mutex		mdio_mutex;
 	struct completion	mdio_complete;