adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Haavard Skinnemoen 2006-12-08 14:37:35 +01:00 committed by Jeff Garzik
parent 68dc44af63
commit d836cae4f6
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/macb.c
View file

@ -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);

2
drivers/net/macb.h
View file

@ -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;