Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbeb4384 authored by Jean Delvare's avatar Jean Delvare Committed by Linus Torvalds
Browse files

edac: use to_delayed_work() 



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.

linux-2.6.30-rc1 has the to_delayed_work() function that will allow this
patch to work

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarDoug Thompson <dougthompson@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e6da46b2

drivers/edac/edac_device.c

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static void del_edac_device_from_global_list(struct edac_device_ctl_info 
 */

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 = to_delayed_work(work_req);

	struct edac_device_ctl_info *edac_dev = to_edac_device_ctl_work(d_work);



	mutex_lock(&device_ctls_mutex);

drivers/edac/edac_mc.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static int edac_mc_assert_error_check_and_clear(void) 
 */

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 = to_delayed_work(work_req);

	struct mem_ctl_info *mci = to_edac_mem_ctl_work(d_work);



	mutex_lock(&mem_ctls_mutex);

drivers/edac/edac_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ 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 = to_delayed_work(work_req);

	struct edac_pci_ctl_info *pci = to_edac_pci_ctl_work(d_work);

	int msec;

	unsigned long delay;