From 86aa8cb7bc47fe786df073246055d69d98e6330a Mon Sep 17 00:00:00 2001 From: Douglas Thompson Date: Thu, 19 Jul 2007 01:50:01 -0700 Subject: drivers/edac: cleanup workq ifdefs The origin of this code comes from patches at sourceforge, that allow EDAC to be updated to various kernels. With kernel version 2.6.20 a new workq system was installed, thus the patches needed to be modified based on the kernel version. For submitting to the latest kernel.org those #ifdefs are removed Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/edac/edac_pci.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'drivers/edac/edac_pci.c') diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c index abefd96680d..ac16b434a3c 100644 --- a/drivers/edac/edac_pci.c +++ b/drivers/edac/edac_pci.c @@ -214,16 +214,10 @@ EXPORT_SYMBOL_GPL(edac_pci_find); * edac_pci_workq_function() * performs the operation scheduled by a workq request */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) static void edac_pci_workq_function(struct work_struct *work_req) { struct delayed_work *d_work = (struct delayed_work *)work_req; struct edac_pci_ctl_info *pci = to_edac_pci_ctl_work(d_work); -#else -static void edac_pci_workq_function(void *ptr) -{ - struct edac_pci_ctl_info *pci = ptr; -#endif edac_lock_pci_list(); @@ -248,11 +242,7 @@ static void edac_pci_workq_setup(struct edac_pci_ctl_info *pci, { debugf0("%s()\n", __func__); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) INIT_DELAYED_WORK(&pci->work, edac_pci_workq_function); -#else - INIT_WORK(&pci->work, edac_pci_workq_function, pci); -#endif queue_delayed_work(edac_workqueue, &pci->work, msecs_to_jiffies(edac_pci_get_poll_msec())); } -- cgit v1.2.3