From ac99c8d8a1914ed0509a3c8131fe652ef793f955 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Wed, 6 Dec 2006 19:50:06 +0000
Subject: [PATCH] --- yaml --- r: 42623 b: refs/heads/master c:
 91c7c56855855d63c46c854c38576135be31a4c9 h: refs/heads/master i:   42621:
 151f83c16e4120db140103e63b7705e8a159f218   42619:
 9a790f95964c8200e3ada70502ac666e9c5f116a   42615:
 2217d19a0577da0e011235a8e76b6105ed9e591c   42607:
 a71b96fe4d06b18429c5af38c60a0a8e98ac4c5e   42591:
 884998a0dbdb2d2a6f7fb0da8c54a54555d350dd   42559:
 1c865aeab284e0739934b88caed7cd3d5ccbf9fe   42495:
 cdaad9d7f27b0a9fb6a08cc1c1d353e7ef9b4a0c v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/i2c/chips/m41t00.c | 9 ++++++++-
 trunk/drivers/net/mv643xx_eth.c  | 9 +++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 2d187433d21f..661a7c26c79b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4927b3f74c6a2fd92226dcf1542a598be9738808
+refs/heads/master: 91c7c56855855d63c46c854c38576135be31a4c9
diff --git a/trunk/drivers/i2c/chips/m41t00.c b/trunk/drivers/i2c/chips/m41t00.c
index 2dd0a34d9472..420377c86422 100644
--- a/trunk/drivers/i2c/chips/m41t00.c
+++ b/trunk/drivers/i2c/chips/m41t00.c
@@ -215,8 +215,15 @@ m41t00_set(void *arg)
 }
 
 static ulong new_time;
+/* well, isn't this API just _lovely_? */
+static void
+m41t00_barf(struct work_struct *unusable)
+{
+	m41t00_set(&new_time);
+}
+
 static struct workqueue_struct *m41t00_wq;
-static DECLARE_WORK(m41t00_work, m41t00_set, &new_time);
+static DECLARE_WORK(m41t00_work, m41t00_barf);
 
 int
 m41t00_set_rtc_time(ulong nowtime)
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index 9997081c6dae..d9f48bb04b05 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/drivers/net/mv643xx_eth.c
@@ -277,9 +277,11 @@ static void mv643xx_eth_tx_timeout(struct net_device *dev)
  *
  * Actual routine to reset the adapter when a timeout on Tx has occurred
  */
-static void mv643xx_eth_tx_timeout_task(struct net_device *dev)
+static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly)
 {
-	struct mv643xx_private *mp = netdev_priv(dev);
+	struct mv643xx_private *mp = container_of(ugly, struct mv643xx_private,
+						  tx_timeout_task);
+	struct net_device *dev = mp->mii.dev; /* yuck */
 
 	if (!netif_running(dev))
 		return;
@@ -1360,8 +1362,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 #endif
 
 	/* Configure the timeout task */
-	INIT_WORK(&mp->tx_timeout_task,
-			(void (*)(void *))mv643xx_eth_tx_timeout_task, dev);
+	INIT_WORK(&mp->tx_timeout_task, mv643xx_eth_tx_timeout_task);
 
 	spin_lock_init(&mp->lock);