Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d836cae4 authored by Haavard Skinnemoen's avatar Haavard Skinnemoen Committed by Jeff Garzik
Browse files

[PATCH] MACB: Use struct delayed_work instead of struct work_struct 

The macb driver calls schedule_delayed_work() and friends, so we need
to use a struct delayed_work along with it. The conversion was
explained by David Howells on lkml Dec 5 2006:

http://lkml.org/lkml/2006/12/5/269



Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 68dc44af

drivers/net/macb.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/net/macb.h

+1 −1
Original line number Diff line number Diff line
@@ -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;