Messages in this thread | | | Date | Wed, 8 Apr 2009 08:49:26 +0200 | From | Jean Delvare <> | Subject | Re: [PATCH 1/3] edac: fix worktodo to proper cast |
| |
On Tue, 07 Apr 2009 17:45:50 -0600, dougthompson@xmission.com wrote: > From: Jean Delvare <khali@linux-fr.org> > > The edac-core driver includes code which assumes that the work_struct > which is included in every delayed_work is the first member of that > structure. This is currently the case but might change in the future, > so use to_delayed_work() instead, which doesn't make such an > assumption.
Please just use my original patch instead, which really uses to_delayed_work() as the description says. to_delayed_work() is available in kernel 2.6.30-rc1.
> Signed-off-by: Jean Delvare <khali@linux-fr.org> > Signed-off-by: Doug Thompson <dougthompson@xmission.com> > --- > drivers/edac/edac_device.c | 2 +- > drivers/edac/edac_mc.c | 2 +- > drivers/edac/edac_pci.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > Index: linux-2.6.29/drivers/edac/edac_device.c > =================================================================== > --- linux-2.6.29.orig/drivers/edac/edac_device.c > +++ linux-2.6.29/drivers/edac/edac_device.c > @@ -389,7 +389,8 @@ static void del_edac_device_from_global_ > */ > static void edac_device_workq_function(struct work_struct *work_req) > { > - struct delayed_work *d_work = (struct delayed_work *)work_req; > + struct delayed_work *d_work = > + container_of(work_req, struct delayed_work, work); > struct edac_device_ctl_info *edac_dev = to_edac_device_ctl_work(d_work); > > mutex_lock(&device_ctls_mutex); > Index: linux-2.6.29/drivers/edac/edac_mc.c > =================================================================== > --- linux-2.6.29.orig/drivers/edac/edac_mc.c > +++ linux-2.6.29/drivers/edac/edac_mc.c > @@ -260,7 +260,8 @@ static int edac_mc_assert_error_check_an > */ > static void edac_mc_workq_function(struct work_struct *work_req) > { > - struct delayed_work *d_work = (struct delayed_work *)work_req; > + struct delayed_work *d_work = > + container_of(work_req, struct delayed_work, work); > struct mem_ctl_info *mci = to_edac_mem_ctl_work(d_work); > > mutex_lock(&mem_ctls_mutex); > Index: linux-2.6.29/drivers/edac/edac_pci.c > =================================================================== > --- linux-2.6.29.orig/drivers/edac/edac_pci.c > +++ linux-2.6.29/drivers/edac/edac_pci.c > @@ -232,7 +232,8 @@ EXPORT_SYMBOL_GPL(edac_pci_find); > */ > static void edac_pci_workq_function(struct work_struct *work_req) > { > - struct delayed_work *d_work = (struct delayed_work *)work_req; > + struct delayed_work *d_work = > + container_of(work_req, struct delayed_work, work); > struct edac_pci_ctl_info *pci = to_edac_pci_ctl_work(d_work); > int msec; > unsigned long delay;
-- Jean Delvare
| |