diff options
| author | David S. Miller <davem69@users.sourceforge.net> | 2001-06-02 17:36:09 +0000 |
|---|---|---|
| committer | David S. Miller <davem69@users.sourceforge.net> | 2001-06-02 17:36:09 +0000 |
| commit | 8baf343776893dec121145116dbda04240b98842 (patch) | |
| tree | b2ac820f5fc383ec703f79eba533c587137493d6 | |
| parent | da358c709239948bdbfef5ea4d3f2a22c9dabc23 (diff) | |
Kill several compiler warnings.
| -rw-r--r-- | linux-core/drm_bufs.c | 1 | ||||
| -rw-r--r-- | linux-core/drm_context.c | 1 | ||||
| -rw-r--r-- | linux/drm_bufs.h | 1 | ||||
| -rw-r--r-- | linux/drm_context.h | 1 | ||||
| -rw-r--r-- | linux/gamma_dma.c | 10 |
5 files changed, 8 insertions, 6 deletions
diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c index b1111048..7a1b8448 100644 --- a/linux-core/drm_bufs.c +++ b/linux-core/drm_bufs.c @@ -191,6 +191,7 @@ int DRM(rmmap)(struct inode *inode, struct file *filp, down(&dev->struct_sem); list = &dev->maplist->head; + r_list = NULL; list_for_each(list, &dev->maplist->head) { r_list = (drm_map_list_t *) list; diff --git a/linux-core/drm_context.c b/linux-core/drm_context.c index 7b8839c7..c3d53bc9 100644 --- a/linux-core/drm_context.c +++ b/linux-core/drm_context.c @@ -178,6 +178,7 @@ int DRM(setsareactx)(struct inode *inode, struct file *filp, return -EFAULT; down(&dev->struct_sem); + r_list = NULL; list_for_each(list, &dev->maplist->head) { r_list = (drm_map_list_t *)list; if(r_list->map && diff --git a/linux/drm_bufs.h b/linux/drm_bufs.h index b1111048..7a1b8448 100644 --- a/linux/drm_bufs.h +++ b/linux/drm_bufs.h @@ -191,6 +191,7 @@ int DRM(rmmap)(struct inode *inode, struct file *filp, down(&dev->struct_sem); list = &dev->maplist->head; + r_list = NULL; list_for_each(list, &dev->maplist->head) { r_list = (drm_map_list_t *) list; diff --git a/linux/drm_context.h b/linux/drm_context.h index 7b8839c7..c3d53bc9 100644 --- a/linux/drm_context.h +++ b/linux/drm_context.h @@ -178,6 +178,7 @@ int DRM(setsareactx)(struct inode *inode, struct file *filp, return -EFAULT; down(&dev->struct_sem); + r_list = NULL; list_for_each(list, &dev->maplist->head) { r_list = (drm_map_list_t *)list; if(r_list->map && diff --git a/linux/gamma_dma.c b/linux/gamma_dma.c index 1e290f5d..58729d61 100644 --- a/linux/gamma_dma.c +++ b/linux/gamma_dma.c @@ -175,7 +175,6 @@ static int gamma_do_dma(drm_device_t *dev, int locked) unsigned long length; drm_buf_t *buf; int retcode = 0; - drm_gamma_private_t *dev_priv = dev->dev_private; drm_device_dma_t *dma = dev->dma; #if DRM_DMA_HISTOGRAM cycles_t dma_start, dma_stop; @@ -634,9 +633,7 @@ static int gamma_do_init_dma( drm_device_t *dev, drm_gamma_init_t *init ) drm_gamma_private_t *dev_priv; drm_device_dma_t *dma = dev->dma; drm_buf_t *buf; - unsigned int *pagebuf; - unsigned int physbuf; - int ret, i; + int i; unsigned int *pgt; DRM_DEBUG( "%s\n", __FUNCTION__ ); @@ -738,9 +735,7 @@ int gamma_dma_init( struct inode *inode, struct file *filp, static int gamma_do_copy_dma( drm_device_t *dev, drm_gamma_copy_t *copy ) { drm_device_dma_t *dma = dev->dma; - drm_buf_t *buf; unsigned int *screenbuf; - drm_gamma_private_t *dev_priv; DRM_DEBUG( "%s\n", __FUNCTION__ ); @@ -782,6 +777,8 @@ static int gamma_do_copy_dma( drm_device_t *dev, drm_gamma_copy_t *copy ) #endif /* need to dispatch it now */ + + return 0; /* XXX just a guess.. -DaveM XXX */ } int gamma_dma_copy( struct inode *inode, struct file *filp, @@ -845,6 +842,7 @@ int gamma_setsareactx(struct inode *inode, struct file *filp, return -EFAULT; down(&dev->struct_sem); + r_list = NULL; list_for_each(list, &dev->maplist->head) { r_list = (drm_map_list_t *)list; if(r_list->map && |