diff options
Diffstat (limited to 'drivers/edac/edac_device.c')
-rw-r--r-- | drivers/edac/edac_device.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index 4ce978b72d34..26807af2c5e7 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c | |||
@@ -332,17 +332,10 @@ EXPORT_SYMBOL(edac_device_find); | |||
332 | * edac_device_workq_function | 332 | * edac_device_workq_function |
333 | * performs the operation scheduled by a workq request | 333 | * performs the operation scheduled by a workq request |
334 | */ | 334 | */ |
335 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) | ||
336 | static void edac_device_workq_function(struct work_struct *work_req) | 335 | static void edac_device_workq_function(struct work_struct *work_req) |
337 | { | 336 | { |
338 | struct delayed_work *d_work = (struct delayed_work *)work_req; | 337 | struct delayed_work *d_work = (struct delayed_work *)work_req; |
339 | struct edac_device_ctl_info *edac_dev = to_edac_device_ctl_work(d_work); | 338 | struct edac_device_ctl_info *edac_dev = to_edac_device_ctl_work(d_work); |
340 | #else | ||
341 | static void edac_device_workq_function(void *ptr) | ||
342 | { | ||
343 | struct edac_device_ctl_info *edac_dev = | ||
344 | (struct edac_device_ctl_info *)ptr; | ||
345 | #endif | ||
346 | 339 | ||
347 | //debugf0("%s() here and running\n", __func__); | 340 | //debugf0("%s() here and running\n", __func__); |
348 | lock_device_list(); | 341 | lock_device_list(); |
@@ -372,11 +365,7 @@ void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev, | |||
372 | edac_dev->poll_msec = msec; | 365 | edac_dev->poll_msec = msec; |
373 | edac_calc_delay(edac_dev); /* Calc delay jiffies */ | 366 | edac_calc_delay(edac_dev); /* Calc delay jiffies */ |
374 | 367 | ||
375 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) | ||
376 | INIT_DELAYED_WORK(&edac_dev->work, edac_device_workq_function); | 368 | INIT_DELAYED_WORK(&edac_dev->work, edac_device_workq_function); |
377 | #else | ||
378 | INIT_WORK(&edac_dev->work, edac_device_workq_function, edac_dev); | ||
379 | #endif | ||
380 | queue_delayed_work(edac_workqueue, &edac_dev->work, edac_dev->delay); | 369 | queue_delayed_work(edac_workqueue, &edac_dev->work, edac_dev->delay); |
381 | } | 370 | } |
382 | 371 | ||