From: Adrian Bunk This patch makes some needlessly global functions static. Signed-off-by: Adrian Bunk Cc: Dave Airlie Signed-off-by: Andrew Morton --- drivers/char/drm/i810_dma.c | 2 +- drivers/char/drm/i810_drv.h | 2 -- drivers/char/drm/i830_dma.c | 2 +- drivers/char/drm/i830_drv.h | 3 --- drivers/char/drm/savage_bci.c | 4 +++- drivers/char/drm/savage_drv.h | 1 - drivers/char/drm/via_dma.c | 10 +++++----- drivers/char/drm/via_dmablit.c | 2 +- drivers/char/drm/via_drv.h | 7 ------- drivers/char/drm/via_irq.c | 2 +- 10 files changed, 12 insertions(+), 23 deletions(-) diff -puN drivers/char/drm/i810_dma.c~drivers-char-drm-make-some-functions-static drivers/char/drm/i810_dma.c --- devel/drivers/char/drm/i810_dma.c~drivers-char-drm-make-some-functions-static 2006-01-24 17:08:47.000000000 -0800 +++ devel-akpm/drivers/char/drm/i810_dma.c 2006-01-24 17:08:47.000000000 -0800 @@ -958,7 +958,7 @@ static int i810_flush_queue(drm_device_t } /* Must be called with the lock held */ -void i810_reclaim_buffers(drm_device_t * dev, struct file *filp) +static void i810_reclaim_buffers(drm_device_t * dev, struct file *filp) { drm_device_dma_t *dma = dev->dma; int i; diff -puN drivers/char/drm/i810_drv.h~drivers-char-drm-make-some-functions-static drivers/char/drm/i810_drv.h --- devel/drivers/char/drm/i810_drv.h~drivers-char-drm-make-some-functions-static 2006-01-24 17:08:47.000000000 -0800 +++ devel-akpm/drivers/char/drm/i810_drv.h 2006-01-24 17:08:47.000000000 -0800 @@ -113,8 +113,6 @@ typedef struct drm_i810_private { } drm_i810_private_t; /* i810_dma.c */ -extern void i810_reclaim_buffers(drm_device_t * dev, struct file *filp); - extern int i810_driver_dma_quiescent(drm_device_t * dev); extern void i810_driver_reclaim_buffers_locked(drm_device_t * dev, struct file *filp); diff -puN drivers/char/drm/i830_dma.c~drivers-char-drm-make-some-functions-static drivers/char/drm/i830_dma.c --- devel/drivers/char/drm/i830_dma.c~drivers-char-drm-make-some-functions-static 2006-01-24 17:08:47.000000000 -0800 +++ devel-akpm/drivers/char/drm/i830_dma.c 2006-01-24 17:08:47.000000000 -0800 @@ -1239,7 +1239,7 @@ static int i830_flush_queue(drm_device_t } /* Must be called with the lock held */ -void i830_reclaim_buffers(drm_device_t * dev, struct file *filp) +static void i830_reclaim_buffers(drm_device_t * dev, struct file *filp) { drm_device_dma_t *dma = dev->dma; int i; diff -puN drivers/char/drm/i830_drv.h~drivers-char-drm-make-some-functions-static drivers/char/drm/i830_drv.h --- devel/drivers/char/drm/i830_drv.h~drivers-char-drm-make-some-functions-static 2006-01-24 17:08:47.000000000 -0800 +++ devel-akpm/drivers/char/drm/i830_drv.h 2006-01-24 17:08:47.000000000 -0800 @@ -123,9 +123,6 @@ typedef struct drm_i830_private { extern drm_ioctl_desc_t i830_ioctls[]; extern int i830_max_ioctl; -/* i830_dma.c */ -extern void i830_reclaim_buffers(drm_device_t * dev, struct file *filp); - /* i830_irq.c */ extern int i830_irq_emit(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); diff -puN drivers/char/drm/savage_bci.c~drivers-char-drm-make-some-functions-static drivers/char/drm/savage_bci.c --- devel/drivers/char/drm/savage_bci.c~drivers-char-drm-make-some-functions-static 2006-01-24 17:08:47.000000000 -0800 +++ devel-akpm/drivers/char/drm/savage_bci.c 2006-01-24 17:08:47.000000000 -0800 @@ -32,6 +32,8 @@ #define SAVAGE_EVENT_USEC_TIMEOUT 5000000 /* 5s */ #define SAVAGE_FREELIST_DEBUG 0 +static int savage_do_cleanup_bci(drm_device_t * dev); + static int savage_bci_wait_fifo_shadow(drm_savage_private_t * dev_priv, unsigned int n) { @@ -895,7 +897,7 @@ static int savage_do_init_bci(drm_device return 0; } -int savage_do_cleanup_bci(drm_device_t * dev) +static int savage_do_cleanup_bci(drm_device_t * dev) { drm_savage_private_t *dev_priv = dev->dev_private; diff -puN drivers/char/drm/savage_drv.h~drivers-char-drm-make-some-functions-static drivers/char/drm/savage_drv.h --- devel/drivers/char/drm/savage_drv.h~drivers-char-drm-make-some-functions-static 2006-01-24 17:08:47.000000000 -0800 +++ devel-akpm/drivers/char/drm/savage_drv.h 2006-01-24 17:08:47.000000000 -0800 @@ -212,7 +212,6 @@ extern int savage_driver_load(drm_device extern int savage_driver_firstopen(drm_device_t *dev); extern void savage_driver_lastclose(drm_device_t *dev); extern int savage_driver_unload(drm_device_t *dev); -extern int savage_do_cleanup_bci(drm_device_t * dev); extern void savage_reclaim_buffers(drm_device_t * dev, DRMFILE filp); /* state functions */ diff -puN drivers/char/drm/via_dmablit.c~drivers-char-drm-make-some-functions-static drivers/char/drm/via_dmablit.c --- devel/drivers/char/drm/via_dmablit.c~drivers-char-drm-make-some-functions-static 2006-01-24 17:08:47.000000000 -0800 +++ devel-akpm/drivers/char/drm/via_dmablit.c 2006-01-24 17:08:47.000000000 -0800 @@ -167,7 +167,7 @@ via_map_blit_for_device(struct pci_dev * */ -void +static void via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) { struct page *page; diff -puN drivers/char/drm/via_dma.c~drivers-char-drm-make-some-functions-static drivers/char/drm/via_dma.c --- devel/drivers/char/drm/via_dma.c~drivers-char-drm-make-some-functions-static 2006-01-24 17:08:47.000000000 -0800 +++ devel-akpm/drivers/char/drm/via_dma.c 2006-01-24 17:08:47.000000000 -0800 @@ -222,7 +222,7 @@ static int via_initialize(drm_device_t * return 0; } -int via_dma_init(DRM_IOCTL_ARGS) +static int via_dma_init(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; @@ -321,7 +321,7 @@ int via_driver_dma_quiescent(drm_device_ return 0; } -int via_flush_ioctl(DRM_IOCTL_ARGS) +static int via_flush_ioctl(DRM_IOCTL_ARGS) { DRM_DEVICE; @@ -330,7 +330,7 @@ int via_flush_ioctl(DRM_IOCTL_ARGS) return via_driver_dma_quiescent(dev); } -int via_cmdbuffer(DRM_IOCTL_ARGS) +static int via_cmdbuffer(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_via_cmdbuffer_t cmdbuf; @@ -375,7 +375,7 @@ static int via_dispatch_pci_cmdbuffer(dr return ret; } -int via_pci_cmdbuffer(DRM_IOCTL_ARGS) +static int via_pci_cmdbuffer(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_via_cmdbuffer_t cmdbuf; @@ -665,7 +665,7 @@ static void via_cmdbuf_reset(drm_via_pri * User interface to the space and lag functions. */ -int via_cmdbuf_size(DRM_IOCTL_ARGS) +static int via_cmdbuf_size(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_via_cmdbuf_size_t d_siz; diff -puN drivers/char/drm/via_drv.h~drivers-char-drm-make-some-functions-static drivers/char/drm/via_drv.h --- devel/drivers/char/drm/via_drv.h~drivers-char-drm-make-some-functions-static 2006-01-24 17:08:47.000000000 -0800 +++ devel-akpm/drivers/char/drm/via_drv.h 2006-01-24 17:08:47.000000000 -0800 @@ -110,11 +110,6 @@ extern int via_mem_free(DRM_IOCTL_ARGS); extern int via_agp_init(DRM_IOCTL_ARGS); extern int via_map_init(DRM_IOCTL_ARGS); extern int via_decoder_futex(DRM_IOCTL_ARGS); -extern int via_dma_init(DRM_IOCTL_ARGS); -extern int via_cmdbuffer(DRM_IOCTL_ARGS); -extern int via_flush_ioctl(DRM_IOCTL_ARGS); -extern int via_pci_cmdbuffer(DRM_IOCTL_ARGS); -extern int via_cmdbuf_size(DRM_IOCTL_ARGS); extern int via_wait_irq(DRM_IOCTL_ARGS); extern int via_dma_blit_sync( DRM_IOCTL_ARGS ); extern int via_dma_blit( DRM_IOCTL_ARGS ); @@ -139,8 +134,6 @@ extern int via_driver_dma_quiescent(drm_ extern void via_init_futex(drm_via_private_t * dev_priv); extern void via_cleanup_futex(drm_via_private_t * dev_priv); extern void via_release_futex(drm_via_private_t * dev_priv, int context); -extern int via_driver_irq_wait(drm_device_t * dev, unsigned int irq, - int force_sequence, unsigned int *sequence); extern void via_dmablit_handler(drm_device_t *dev, int engine, int from_irq); extern void via_init_dmablit(drm_device_t *dev); diff -puN drivers/char/drm/via_irq.c~drivers-char-drm-make-some-functions-static drivers/char/drm/via_irq.c --- devel/drivers/char/drm/via_irq.c~drivers-char-drm-make-some-functions-static 2006-01-24 17:08:47.000000000 -0800 +++ devel-akpm/drivers/char/drm/via_irq.c 2006-01-24 17:08:47.000000000 -0800 @@ -190,7 +190,7 @@ int via_driver_vblank_wait(drm_device_t return ret; } -int +static int via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence, unsigned int *sequence) { _