[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090403174649.42626ae6@hyperion.delvare>
Date: Fri, 3 Apr 2009 17:46:49 +0200
From: Jean Delvare <khali@...ux-fr.org>
To: Greg Kroah-Hartman <gregkh@...e.de>
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] Staging: rtl8187se: Use to_delayed_work
Use the recently added to_delayed_work() helper function.
Signed-off-by: Jean Delvare <khali@...ux-fr.org>
---
drivers/staging/rtl8187se/r8180_dm.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- linux-2.6.30-rc0.orig/drivers/staging/rtl8187se/r8180_dm.c 2009-04-03 17:19:23.000000000 +0200
+++ linux-2.6.30-rc0/drivers/staging/rtl8187se/r8180_dm.c 2009-04-03 17:40:32.000000000 +0200
@@ -132,7 +132,7 @@ void rtl8180_tx_pw_wq (struct work_struc
// struct r8180_priv *priv = container_of(work, struct r8180_priv, watch_dog_wq);
// struct ieee80211_device * ieee = (struct ieee80211_device*)
// container_of(work, struct ieee80211_device, watch_dog_wq);
- struct delayed_work *dwork = container_of(work,struct delayed_work,work);
+ struct delayed_work *dwork = to_delayed_work(work);
struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,tx_pw_wq);
struct net_device *dev = ieee->dev;
#else
@@ -314,7 +314,7 @@ void rtl8180_hw_dig_wq (struct work_stru
// struct r8180_priv *priv = container_of(work, struct r8180_priv, watch_dog_wq);
// struct ieee80211_device * ieee = (struct ieee80211_device*)
// container_of(work, struct ieee80211_device, watch_dog_wq);
- struct delayed_work *dwork = container_of(work,struct delayed_work,work);
+ struct delayed_work *dwork = to_delayed_work(work);
struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_dig_wq);
struct net_device *dev = ieee->dev;
#else
@@ -1250,7 +1250,7 @@ SetInitialGain:
#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20)
void rtl8180_rate_adapter(struct work_struct * work)
{
- struct delayed_work *dwork = container_of(work,struct delayed_work,work);
+ struct delayed_work *dwork = to_delayed_work(work);
struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,rate_adapter_wq);
struct net_device *dev = ieee->dev;
#else
--
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists