drm: drivers/char/drm/: make some functions static

From: Adrian Bunk <bunk@stusta.de>

This patch makes some needlessly global functions static.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>

authored by Dave Airlie and committed by Dave Airlie ce60fe02 339363c4

+12 -23
+1 -1
drivers/char/drm/i810_dma.c
··· 958 } 959 960 /* Must be called with the lock held */ 961 - void i810_reclaim_buffers(drm_device_t * dev, struct file *filp) 962 { 963 drm_device_dma_t *dma = dev->dma; 964 int i;
··· 958 } 959 960 /* Must be called with the lock held */ 961 + static void i810_reclaim_buffers(drm_device_t * dev, struct file *filp) 962 { 963 drm_device_dma_t *dma = dev->dma; 964 int i;
-2
drivers/char/drm/i810_drv.h
··· 113 } drm_i810_private_t; 114 115 /* i810_dma.c */ 116 - extern void i810_reclaim_buffers(drm_device_t * dev, struct file *filp); 117 - 118 extern int i810_driver_dma_quiescent(drm_device_t * dev); 119 extern void i810_driver_reclaim_buffers_locked(drm_device_t * dev, 120 struct file *filp);
··· 113 } drm_i810_private_t; 114 115 /* i810_dma.c */ 116 extern int i810_driver_dma_quiescent(drm_device_t * dev); 117 extern void i810_driver_reclaim_buffers_locked(drm_device_t * dev, 118 struct file *filp);
+1 -1
drivers/char/drm/i830_dma.c
··· 1239 } 1240 1241 /* Must be called with the lock held */ 1242 - void i830_reclaim_buffers(drm_device_t * dev, struct file *filp) 1243 { 1244 drm_device_dma_t *dma = dev->dma; 1245 int i;
··· 1239 } 1240 1241 /* Must be called with the lock held */ 1242 + static void i830_reclaim_buffers(drm_device_t * dev, struct file *filp) 1243 { 1244 drm_device_dma_t *dma = dev->dma; 1245 int i;
-3
drivers/char/drm/i830_drv.h
··· 123 extern drm_ioctl_desc_t i830_ioctls[]; 124 extern int i830_max_ioctl; 125 126 - /* i830_dma.c */ 127 - extern void i830_reclaim_buffers(drm_device_t * dev, struct file *filp); 128 - 129 /* i830_irq.c */ 130 extern int i830_irq_emit(struct inode *inode, struct file *filp, 131 unsigned int cmd, unsigned long arg);
··· 123 extern drm_ioctl_desc_t i830_ioctls[]; 124 extern int i830_max_ioctl; 125 126 /* i830_irq.c */ 127 extern int i830_irq_emit(struct inode *inode, struct file *filp, 128 unsigned int cmd, unsigned long arg);
+3 -1
drivers/char/drm/savage_bci.c
··· 32 #define SAVAGE_EVENT_USEC_TIMEOUT 5000000 /* 5s */ 33 #define SAVAGE_FREELIST_DEBUG 0 34 35 static int 36 savage_bci_wait_fifo_shadow(drm_savage_private_t * dev_priv, unsigned int n) 37 { ··· 897 return 0; 898 } 899 900 - int savage_do_cleanup_bci(drm_device_t * dev) 901 { 902 drm_savage_private_t *dev_priv = dev->dev_private; 903
··· 32 #define SAVAGE_EVENT_USEC_TIMEOUT 5000000 /* 5s */ 33 #define SAVAGE_FREELIST_DEBUG 0 34 35 + static int savage_do_cleanup_bci(drm_device_t *dev); 36 + 37 static int 38 savage_bci_wait_fifo_shadow(drm_savage_private_t * dev_priv, unsigned int n) 39 { ··· 895 return 0; 896 } 897 898 + static int savage_do_cleanup_bci(drm_device_t * dev) 899 { 900 drm_savage_private_t *dev_priv = dev->dev_private; 901
-1
drivers/char/drm/savage_drv.h
··· 212 extern int savage_driver_firstopen(drm_device_t *dev); 213 extern void savage_driver_lastclose(drm_device_t *dev); 214 extern int savage_driver_unload(drm_device_t *dev); 215 - extern int savage_do_cleanup_bci(drm_device_t * dev); 216 extern void savage_reclaim_buffers(drm_device_t * dev, DRMFILE filp); 217 218 /* state functions */
··· 212 extern int savage_driver_firstopen(drm_device_t *dev); 213 extern void savage_driver_lastclose(drm_device_t *dev); 214 extern int savage_driver_unload(drm_device_t *dev); 215 extern void savage_reclaim_buffers(drm_device_t * dev, DRMFILE filp); 216 217 /* state functions */
+5 -5
drivers/char/drm/via_dma.c
··· 222 return 0; 223 } 224 225 - int via_dma_init(DRM_IOCTL_ARGS) 226 { 227 DRM_DEVICE; 228 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; ··· 321 return 0; 322 } 323 324 - int via_flush_ioctl(DRM_IOCTL_ARGS) 325 { 326 DRM_DEVICE; 327 ··· 330 return via_driver_dma_quiescent(dev); 331 } 332 333 - int via_cmdbuffer(DRM_IOCTL_ARGS) 334 { 335 DRM_DEVICE; 336 drm_via_cmdbuffer_t cmdbuf; ··· 375 return ret; 376 } 377 378 - int via_pci_cmdbuffer(DRM_IOCTL_ARGS) 379 { 380 DRM_DEVICE; 381 drm_via_cmdbuffer_t cmdbuf; ··· 665 * User interface to the space and lag functions. 666 */ 667 668 - int via_cmdbuf_size(DRM_IOCTL_ARGS) 669 { 670 DRM_DEVICE; 671 drm_via_cmdbuf_size_t d_siz;
··· 222 return 0; 223 } 224 225 + static int via_dma_init(DRM_IOCTL_ARGS) 226 { 227 DRM_DEVICE; 228 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; ··· 321 return 0; 322 } 323 324 + static int via_flush_ioctl(DRM_IOCTL_ARGS) 325 { 326 DRM_DEVICE; 327 ··· 330 return via_driver_dma_quiescent(dev); 331 } 332 333 + static int via_cmdbuffer(DRM_IOCTL_ARGS) 334 { 335 DRM_DEVICE; 336 drm_via_cmdbuffer_t cmdbuf; ··· 375 return ret; 376 } 377 378 + static int via_pci_cmdbuffer(DRM_IOCTL_ARGS) 379 { 380 DRM_DEVICE; 381 drm_via_cmdbuffer_t cmdbuf; ··· 665 * User interface to the space and lag functions. 666 */ 667 668 + static int via_cmdbuf_size(DRM_IOCTL_ARGS) 669 { 670 DRM_DEVICE; 671 drm_via_cmdbuf_size_t d_siz;
+1 -1
drivers/char/drm/via_dmablit.c
··· 167 */ 168 169 170 - void 171 via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) 172 { 173 struct page *page;
··· 167 */ 168 169 170 + static void 171 via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) 172 { 173 struct page *page;
-7
drivers/char/drm/via_drv.h
··· 110 extern int via_agp_init(DRM_IOCTL_ARGS); 111 extern int via_map_init(DRM_IOCTL_ARGS); 112 extern int via_decoder_futex(DRM_IOCTL_ARGS); 113 - extern int via_dma_init(DRM_IOCTL_ARGS); 114 - extern int via_cmdbuffer(DRM_IOCTL_ARGS); 115 - extern int via_flush_ioctl(DRM_IOCTL_ARGS); 116 - extern int via_pci_cmdbuffer(DRM_IOCTL_ARGS); 117 - extern int via_cmdbuf_size(DRM_IOCTL_ARGS); 118 extern int via_wait_irq(DRM_IOCTL_ARGS); 119 extern int via_dma_blit_sync( DRM_IOCTL_ARGS ); 120 extern int via_dma_blit( DRM_IOCTL_ARGS ); ··· 134 extern void via_init_futex(drm_via_private_t * dev_priv); 135 extern void via_cleanup_futex(drm_via_private_t * dev_priv); 136 extern void via_release_futex(drm_via_private_t * dev_priv, int context); 137 - extern int via_driver_irq_wait(drm_device_t * dev, unsigned int irq, 138 - int force_sequence, unsigned int *sequence); 139 140 extern void via_dmablit_handler(drm_device_t *dev, int engine, int from_irq); 141 extern void via_init_dmablit(drm_device_t *dev);
··· 110 extern int via_agp_init(DRM_IOCTL_ARGS); 111 extern int via_map_init(DRM_IOCTL_ARGS); 112 extern int via_decoder_futex(DRM_IOCTL_ARGS); 113 extern int via_wait_irq(DRM_IOCTL_ARGS); 114 extern int via_dma_blit_sync( DRM_IOCTL_ARGS ); 115 extern int via_dma_blit( DRM_IOCTL_ARGS ); ··· 139 extern void via_init_futex(drm_via_private_t * dev_priv); 140 extern void via_cleanup_futex(drm_via_private_t * dev_priv); 141 extern void via_release_futex(drm_via_private_t * dev_priv, int context); 142 143 extern void via_dmablit_handler(drm_device_t *dev, int engine, int from_irq); 144 extern void via_init_dmablit(drm_device_t *dev);
+1 -1
drivers/char/drm/via_irq.c
··· 190 return ret; 191 } 192 193 - int 194 via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence, 195 unsigned int *sequence) 196 {
··· 190 return ret; 191 } 192 193 + static int 194 via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence, 195 unsigned int *sequence) 196 {