* [PATCH] MACB: Use struct delayed_work instead of struct work_struct
@ 2006-12-08 13:37 Haavard Skinnemoen
2006-12-08 13:38 ` [PATCH] MACB: Use __raw register access Haavard Skinnemoen
2006-12-11 14:32 ` [PATCH] MACB: Use struct delayed_work instead of struct work_struct Jeff Garzik
0 siblings, 2 replies; 3+ messages in thread
From: Haavard Skinnemoen @ 2006-12-08 13:37 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev, Patrice Vilchez, Andrew Victor
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>
---
drivers/net/macb.c | 6 +++---
drivers/net/macb.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index bd0ce98..3496d19 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -267,9 +267,9 @@ static void macb_update_stats(struct mac
*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 p
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/drivers/net/macb.h b/drivers/net/macb.h
index 8c253db..e3fcb2e 100644
--- a/drivers/net/macb.h
+++ b/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;
--
1.4.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH] MACB: Use __raw register access
2006-12-08 13:37 [PATCH] MACB: Use struct delayed_work instead of struct work_struct Haavard Skinnemoen
@ 2006-12-08 13:38 ` Haavard Skinnemoen
2006-12-11 14:32 ` [PATCH] MACB: Use struct delayed_work instead of struct work_struct Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Haavard Skinnemoen @ 2006-12-08 13:38 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev, Patrice Vilchez, Andrew Victor
Since macb is a chip-internal device, use __raw_readl and
__raw_writel instead of readl/writel. This will perform native-endian
accesses, which is the right thing to do on both AVR32 and ARM devices.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
---
drivers/net/macb.c | 2 +-
drivers/net/macb.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 3496d19..25b559b 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -264,7 +264,7 @@ static void macb_update_stats(struct mac
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(struct work_struct *work)
diff --git a/drivers/net/macb.h b/drivers/net/macb.h
index e3fcb2e..27bf0ae 100644
--- a/drivers/net/macb.h
+++ b/drivers/net/macb.h
@@ -250,9 +250,9 @@
/* Register access macros */
#define macb_readl(port,reg) \
- readl((port)->regs + MACB_##reg)
+ __raw_readl((port)->regs + MACB_##reg)
#define macb_writel(port,reg,value) \
- writel((value), (port)->regs + MACB_##reg)
+ __raw_writel((value), (port)->regs + MACB_##reg)
struct dma_desc {
u32 addr;
--
1.4.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] MACB: Use struct delayed_work instead of struct work_struct
2006-12-08 13:37 [PATCH] MACB: Use struct delayed_work instead of struct work_struct Haavard Skinnemoen
2006-12-08 13:38 ` [PATCH] MACB: Use __raw register access Haavard Skinnemoen
@ 2006-12-11 14:32 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2006-12-11 14:32 UTC (permalink / raw)
To: Haavard Skinnemoen; +Cc: netdev, Patrice Vilchez, Andrew Victor
Haavard Skinnemoen wrote:
> 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>
applied this, and the raw register access patch
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-12-11 14:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-12-08 13:37 [PATCH] MACB: Use struct delayed_work instead of struct work_struct Haavard Skinnemoen
2006-12-08 13:38 ` [PATCH] MACB: Use __raw register access Haavard Skinnemoen
2006-12-11 14:32 ` [PATCH] MACB: Use struct delayed_work instead of struct work_struct Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).