diff options
Diffstat (limited to 'drivers/edac/edac_pci.c')
-rw-r--r-- | drivers/edac/edac_pci.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c index abefd96680d7..ac16b434a3c5 100644 --- a/drivers/edac/edac_pci.c +++ b/drivers/edac/edac_pci.c | |||
@@ -214,16 +214,10 @@ EXPORT_SYMBOL_GPL(edac_pci_find); | |||
214 | * edac_pci_workq_function() | 214 | * edac_pci_workq_function() |
215 | * performs the operation scheduled by a workq request | 215 | * performs the operation scheduled by a workq request |
216 | */ | 216 | */ |
217 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) | ||
218 | static void edac_pci_workq_function(struct work_struct *work_req) | 217 | static void edac_pci_workq_function(struct work_struct *work_req) |
219 | { | 218 | { |
220 | struct delayed_work *d_work = (struct delayed_work *)work_req; | 219 | struct delayed_work *d_work = (struct delayed_work *)work_req; |
221 | struct edac_pci_ctl_info *pci = to_edac_pci_ctl_work(d_work); | 220 | struct edac_pci_ctl_info *pci = to_edac_pci_ctl_work(d_work); |
222 | #else | ||
223 | static void edac_pci_workq_function(void *ptr) | ||
224 | { | ||
225 | struct edac_pci_ctl_info *pci = ptr; | ||
226 | #endif | ||
227 | 221 | ||
228 | edac_lock_pci_list(); | 222 | edac_lock_pci_list(); |
229 | 223 | ||
@@ -248,11 +242,7 @@ static void edac_pci_workq_setup(struct edac_pci_ctl_info *pci, | |||
248 | { | 242 | { |
249 | debugf0("%s()\n", __func__); | 243 | debugf0("%s()\n", __func__); |
250 | 244 | ||
251 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) | ||
252 | INIT_DELAYED_WORK(&pci->work, edac_pci_workq_function); | 245 | INIT_DELAYED_WORK(&pci->work, edac_pci_workq_function); |
253 | #else | ||
254 | INIT_WORK(&pci->work, edac_pci_workq_function, pci); | ||
255 | #endif | ||
256 | queue_delayed_work(edac_workqueue, &pci->work, | 246 | queue_delayed_work(edac_workqueue, &pci->work, |
257 | msecs_to_jiffies(edac_pci_get_poll_msec())); | 247 | msecs_to_jiffies(edac_pci_get_poll_msec())); |
258 | } | 248 | } |