1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index bd0ce98c939c..25b559b5d5ed 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -264,12 +264,12 @@ static void macb_update_stats(struct macb *bp)
         WARN_ON((unsigned long)(end - p - 1) != (MACB_TPF - MACB_PFR) / 4);
 
         for(; p < end; p++, reg++)
-                *p += readl(reg);
+                *p += __raw_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);