Signed-off-by: Pekka Paalanen <[email protected]>
---
linux-core/drm_bo.c | 13 -------------
linux-core/drm_objects.h | 4 ----
linux-core/via_dmablit.c | 12 ------------
3 files changed, 0 insertions(+), 29 deletions(-)
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index 6f083f5..f43480c 100644
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -481,20 +481,11 @@ static void drm_bo_delayed_delete(struct drm_device *dev,
int remove_all)
}
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-static void drm_bo_delayed_workqueue(void *data)
-#else
static void drm_bo_delayed_workqueue(struct work_struct *work)
-#endif
{
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- struct drm_device *dev = (struct drm_device *) data;
- struct drm_buffer_manager *bm = &dev->bm;
-#else
struct drm_buffer_manager *bm =
container_of(work, struct drm_buffer_manager, wq.work);
struct drm_device *dev = container_of(bm, struct drm_device, bm);
-#endif
DRM_DEBUG("Delayed delete Worker\n");
@@ -2356,11 +2347,7 @@ int drm_bo_driver_init(struct drm_device *dev)
if (ret)
goto out_unlock;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- INIT_WORK(&bm->wq, &drm_bo_delayed_workqueue, dev);
-#else
INIT_DELAYED_WORK(&bm->wq, drm_bo_delayed_workqueue);
-#endif
bm->initialized = 1;
bm->nice_mode = 1;
atomic_set(&bm->count, 0);
diff --git a/linux-core/drm_objects.h b/linux-core/drm_objects.h
index 2f49bcf..136fdc8 100644
--- a/linux-core/drm_objects.h
+++ b/linux-core/drm_objects.h
@@ -563,11 +563,7 @@ struct drm_buffer_manager {
struct drm_mem_type_manager man[DRM_BO_MEM_TYPES];
struct list_head unfenced;
struct list_head ddestroy;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- struct work_struct wq;
-#else
struct delayed_work wq;
-#endif
uint32_t fence_type;
unsigned long cur_pages;
atomic_t count;
diff --git a/linux-core/via_dmablit.c b/linux-core/via_dmablit.c
index b5f9f05..59e1e11 100644
--- a/linux-core/via_dmablit.c
+++ b/linux-core/via_dmablit.c
@@ -500,17 +500,9 @@ via_dmablit_timer(unsigned long data)
static void
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-via_dmablit_workqueue(void *data)
-#else
via_dmablit_workqueue(struct work_struct *work)
-#endif
{
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- drm_via_blitq_t *blitq = (drm_via_blitq_t *) data;
-#else
drm_via_blitq_t *blitq = container_of(work, drm_via_blitq_t, wq);
-#endif
struct drm_device *dev = blitq->dev;
unsigned long irqsave;
drm_via_sg_info_t *cur_sg;
@@ -579,11 +571,7 @@ via_init_dmablit(struct drm_device *dev)
DRM_INIT_WAITQUEUE(blitq->blit_queue + j);
}
DRM_INIT_WAITQUEUE(&blitq->busy_queue);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- INIT_WORK(&blitq->wq, via_dmablit_workqueue, blitq);
-#else
INIT_WORK(&blitq->wq, via_dmablit_workqueue);
-#endif
init_timer(&blitq->poll_timer);
blitq->poll_timer.function = &via_dmablit_timer;
blitq->poll_timer.data = (unsigned long) blitq;
--
1.6.0.6
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
--
_______________________________________________
Dri-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel
