Remove unused dev->map_count. We always iterate the maplist with

    list_for_each() and the count is not updated or used for stats.

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 08f4faa..a4751f3 100644 (file)
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -554,7 +554,6 @@ typedef struct drm_device {
 
                                /* Memory management */
        drm_map_list_t    *maplist;     /* Linked list of regions          */
-       int               map_count;    /* Number of mappable regions      */
 
        drm_map_t         **context_sareas;
        int               max_context;

diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 88d27e1..4a15fae 100644 (file)
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -316,7 +316,6 @@ static int DRM(setup)( drm_device_t *dev )
        if(dev->maplist == NULL) return -ENOMEM;
        memset(dev->maplist, 0, sizeof(*dev->maplist));
        INIT_LIST_HEAD(&dev->maplist->head);
-       dev->map_count = 0;
 
        dev->vmalist = NULL;
        dev->sigdata.lock = dev->lock.hw_lock = NULL;

diff --git a/linux-core/drm_ioctl.c b/linux-core/drm_ioctl.c
index 9b1069a..62d5a6e 100644 (file)
--- a/linux-core/drm_ioctl.c
+++ b/linux-core/drm_ioctl.c
@@ -197,7 +197,7 @@ int DRM(getmap)( struct inode *inode, struct file *filp,
        idx = map.offset;
 
        down(&dev->struct_sem);
-       if (idx < 0 || idx >= dev->map_count) {
+       if (idx < 0) {
                up(&dev->struct_sem);
                return -EINVAL;
        }

diff --git a/linux/drmP.h b/linux/drmP.h
index 08f4faa..a4751f3 100644 (file)
--- a/linux/drmP.h
+++ b/linux/drmP.h
@@ -554,7 +554,6 @@ typedef struct drm_device {
 
                                /* Memory management */
        drm_map_list_t    *maplist;     /* Linked list of regions          */
-       int               map_count;    /* Number of mappable regions      */
 
        drm_map_t         **context_sareas;
        int               max_context;

diff --git a/linux/drm_drv.h b/linux/drm_drv.h
index 88d27e1..4a15fae 100644 (file)
--- a/linux/drm_drv.h
+++ b/linux/drm_drv.h
@@ -316,7 +316,6 @@ static int DRM(setup)( drm_device_t *dev )
        if(dev->maplist == NULL) return -ENOMEM;
        memset(dev->maplist, 0, sizeof(*dev->maplist));
        INIT_LIST_HEAD(&dev->maplist->head);
-       dev->map_count = 0;
 
        dev->vmalist = NULL;
        dev->sigdata.lock = dev->lock.hw_lock = NULL;

diff --git a/linux/drm_ioctl.h b/linux/drm_ioctl.h
index 9b1069a..62d5a6e 100644 (file)
--- a/linux/drm_ioctl.h
+++ b/linux/drm_ioctl.h
@@ -197,7 +197,7 @@ int DRM(getmap)( struct inode *inode, struct file *filp,
        idx = map.offset;
 
        down(&dev->struct_sem);
-       if (idx < 0 || idx >= dev->map_count) {
+       if (idx < 0) {
                up(&dev->struct_sem);
                return -EINVAL;
        }