drivers/char/drm/: make some functions static
PATCH 1/1 drivers/char/drm/: make some functions static
This patch makes some needlessly global functions static.
Signed-off-by Adrian Bunk <[email protected]>
---
This patch was already sent on:
- 19 Jan 2006
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(-)
drivers/char/drm/i810_drv.h renamed from drivers/char/drm/i810_drv.h.old +0 -2
@@ -113,8 +113,6 @@ } 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);
drivers/char/drm/i810_dma.c renamed from drivers/char/drm/i810_dma.c.old +1 -1
@@ -958,7 +958,7 @@ }/* 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;
drivers/char/drm/i830_drv.h renamed from drivers/char/drm/i830_drv.h.old +0 -3
@@ -123,9 +123,6 @@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);
drivers/char/drm/i830_dma.c renamed from drivers/char/drm/i830_dma.c.old +1 -1
@@ -1239,7 +1239,7 @@ }/* 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;
drivers/char/drm/savage_drv.h renamed from drivers/char/drm/savage_drv.h.old +0 -1
@@ -212,7 +212,6 @@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 */
drivers/char/drm/savage_bci.c renamed from drivers/char/drm/savage_bci.c.old +3 -1
@@ -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 @@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;
drivers/char/drm/via_drv.h renamed from drivers/char/drm/via_drv.h.old +0 -7
@@ -110,11 +110,6 @@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 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);
drivers/char/drm/via_dma.c renamed from drivers/char/drm/via_dma.c.old +5 -5
@@ -222,7 +222,7 @@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 @@return 0 ; } -int via_flush_ioctl (DRM_IOCTL_ARGS ) +static int via_flush_ioctl (DRM_IOCTL_ARGS ) {DRM_DEVICE ;
@@ -330,7 +330,7 @@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 @@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 @@* 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;
drivers/char/drm/via_dmablit.c renamed from drivers/char/drm/via_dmablit.c.old +1 -1
@@ -167,7 +167,7 @@*/ -void +static void via_free_sg_info (struct pci_dev *pdev,drm_via_sg_info_t *vsg) {struct page *page;
drivers/char/drm/via_irq.c renamed from drivers/char/drm/via_irq.c.old +1 -1
@@ -190,7 +190,7 @@return ret; } -int +static int via_driver_irq_wait (drm_device_t * dev,unsigned int irq,int force_sequence,unsigned int *sequence) {