LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: Al Viro <viro@ftp.linux.org.uk> To: Linus Torvalds <torvalds@osdl.org> Cc: dhowells@redhat.com, linux-kernel@vger.kernel.org Subject: Re: ... and more... Date: Wed, 6 Dec 2006 19:50:06 +0000 [thread overview] Message-ID: <20061206195006.GH4587@ftp.linux.org.uk> (raw) In-Reply-To: <20061206194641.GG4587@ftp.linux.org.uk> On Wed, Dec 06, 2006 at 07:46:41PM +0000, Al Viro wrote: Gah... Harmless but stupid: leftover netdev_priv(dev); diff --git a/drivers/i2c/chips/m41t00.c b/drivers/i2c/chips/m41t00.c index 2dd0a34..420377c 100644 --- a/drivers/i2c/chips/m41t00.c +++ b/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/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 21d0137..c41ae42 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -277,9 +277,11 @@ static void mv643xx_eth_tx_timeout(struc * * 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 @@ #endif #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);
next prev parent reply other threads:[~2006-12-06 19:50 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2006-12-06 18:41 work_struct-induced breakage, part 1 of fsck-knows-how-many Al Viro 2006-12-06 18:51 ` more work_struct-induced breakage Al Viro 2006-12-06 19:18 ` and more of the same Al Viro 2006-12-06 19:46 ` ... and more Al Viro 2006-12-06 19:50 ` Al Viro [this message] 2006-12-06 21:15 ` ... and then some Al Viro 2006-12-07 13:08 ` ... and more David Howells
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20061206195006.GH4587@ftp.linux.org.uk \ --to=viro@ftp.linux.org.uk \ --cc=dhowells@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=torvalds@osdl.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).