* [PATCH] Staging: rtl8187se: Use to_delayed_work
@ 2009-04-03 15:46 Jean Delvare
2009-04-21 9:07 ` Jean Delvare
0 siblings, 1 reply; 3+ messages in thread
From: Jean Delvare @ 2009-04-03 15:46 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-kernel
Use the recently added to_delayed_work() helper function.
Signed-off-by: Jean Delvare <khali@linux-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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Staging: rtl8187se: Use to_delayed_work
2009-04-03 15:46 [PATCH] Staging: rtl8187se: Use to_delayed_work Jean Delvare
@ 2009-04-21 9:07 ` Jean Delvare
2009-04-21 14:44 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Jean Delvare @ 2009-04-21 9:07 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-kernel
On Fri, 3 Apr 2009 17:46:49 +0200, Jean Delvare wrote:
> Use the recently added to_delayed_work() helper function.
>
> Signed-off-by: Jean Delvare <khali@linux-fr.org>
> ---
> drivers/staging/rtl8187se/r8180_dm.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Greg, can you please add this patch to your staging tree? Thanks.
>
> --- 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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Staging: rtl8187se: Use to_delayed_work
2009-04-21 9:07 ` Jean Delvare
@ 2009-04-21 14:44 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2009-04-21 14:44 UTC (permalink / raw)
To: Jean Delvare; +Cc: linux-kernel
On Tue, Apr 21, 2009 at 11:07:52AM +0200, Jean Delvare wrote:
> On Fri, 3 Apr 2009 17:46:49 +0200, Jean Delvare wrote:
> > Use the recently added to_delayed_work() helper function.
> >
> > Signed-off-by: Jean Delvare <khali@linux-fr.org>
> > ---
> > drivers/staging/rtl8187se/r8180_dm.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
>
> Greg, can you please add this patch to your staging tree? Thanks.
Yes, sorry, too much "real work" these days, my patch queue is needing a
lot of work...
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-04-21 15:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-03 15:46 [PATCH] Staging: rtl8187se: Use to_delayed_work Jean Delvare
2009-04-21 9:07 ` Jean Delvare
2009-04-21 14:44 ` Greg KH
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).