Commit ce60fe02 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie

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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 339363c4
...@@ -958,7 +958,7 @@ static int i810_flush_queue(drm_device_t * dev) ...@@ -958,7 +958,7 @@ static int i810_flush_queue(drm_device_t * dev)
} }
/* Must be called with the lock held */ /* 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; drm_device_dma_t *dma = dev->dma;
int i; int i;
......
...@@ -113,8 +113,6 @@ typedef struct drm_i810_private { ...@@ -113,8 +113,6 @@ typedef struct drm_i810_private {
} drm_i810_private_t; } drm_i810_private_t;
/* i810_dma.c */ /* 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 int i810_driver_dma_quiescent(drm_device_t * dev);
extern void i810_driver_reclaim_buffers_locked(drm_device_t * dev, extern void i810_driver_reclaim_buffers_locked(drm_device_t * dev,
struct file *filp); struct file *filp);
......
...@@ -1239,7 +1239,7 @@ static int i830_flush_queue(drm_device_t * dev) ...@@ -1239,7 +1239,7 @@ static int i830_flush_queue(drm_device_t * dev)
} }
/* Must be called with the lock held */ /* 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; drm_device_dma_t *dma = dev->dma;
int i; int i;
......
...@@ -123,9 +123,6 @@ typedef struct drm_i830_private { ...@@ -123,9 +123,6 @@ typedef struct drm_i830_private {
extern drm_ioctl_desc_t i830_ioctls[]; extern drm_ioctl_desc_t i830_ioctls[];
extern int i830_max_ioctl; extern int i830_max_ioctl;
/* i830_dma.c */
extern void i830_reclaim_buffers(drm_device_t * dev, struct file *filp);
/* i830_irq.c */ /* i830_irq.c */
extern int i830_irq_emit(struct inode *inode, struct file *filp, extern int i830_irq_emit(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
#define SAVAGE_EVENT_USEC_TIMEOUT 5000000 /* 5s */ #define SAVAGE_EVENT_USEC_TIMEOUT 5000000 /* 5s */
#define SAVAGE_FREELIST_DEBUG 0 #define SAVAGE_FREELIST_DEBUG 0
static int savage_do_cleanup_bci(drm_device_t *dev);
static int static int
savage_bci_wait_fifo_shadow(drm_savage_private_t * dev_priv, unsigned int n) 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_t * dev, drm_savage_init_t * init) ...@@ -895,7 +897,7 @@ static int savage_do_init_bci(drm_device_t * dev, drm_savage_init_t * init)
return 0; 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; drm_savage_private_t *dev_priv = dev->dev_private;
......
...@@ -212,7 +212,6 @@ extern int savage_driver_load(drm_device_t *dev, unsigned long chipset); ...@@ -212,7 +212,6 @@ extern int savage_driver_load(drm_device_t *dev, unsigned long chipset);
extern int savage_driver_firstopen(drm_device_t *dev); extern int savage_driver_firstopen(drm_device_t *dev);
extern void savage_driver_lastclose(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_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); extern void savage_reclaim_buffers(drm_device_t * dev, DRMFILE filp);
/* state functions */ /* state functions */
......
...@@ -222,7 +222,7 @@ static int via_initialize(drm_device_t * dev, ...@@ -222,7 +222,7 @@ static int via_initialize(drm_device_t * dev,
return 0; return 0;
} }
int via_dma_init(DRM_IOCTL_ARGS) static int via_dma_init(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
...@@ -321,7 +321,7 @@ int via_driver_dma_quiescent(drm_device_t * dev) ...@@ -321,7 +321,7 @@ int via_driver_dma_quiescent(drm_device_t * dev)
return 0; return 0;
} }
int via_flush_ioctl(DRM_IOCTL_ARGS) static int via_flush_ioctl(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
...@@ -330,7 +330,7 @@ int via_flush_ioctl(DRM_IOCTL_ARGS) ...@@ -330,7 +330,7 @@ int via_flush_ioctl(DRM_IOCTL_ARGS)
return via_driver_dma_quiescent(dev); return via_driver_dma_quiescent(dev);
} }
int via_cmdbuffer(DRM_IOCTL_ARGS) static int via_cmdbuffer(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_via_cmdbuffer_t cmdbuf; drm_via_cmdbuffer_t cmdbuf;
...@@ -375,7 +375,7 @@ static int via_dispatch_pci_cmdbuffer(drm_device_t * dev, ...@@ -375,7 +375,7 @@ static int via_dispatch_pci_cmdbuffer(drm_device_t * dev,
return ret; return ret;
} }
int via_pci_cmdbuffer(DRM_IOCTL_ARGS) static int via_pci_cmdbuffer(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_via_cmdbuffer_t cmdbuf; drm_via_cmdbuffer_t cmdbuf;
...@@ -665,7 +665,7 @@ static void via_cmdbuf_reset(drm_via_private_t * dev_priv) ...@@ -665,7 +665,7 @@ static void via_cmdbuf_reset(drm_via_private_t * dev_priv)
* User interface to the space and lag functions. * 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_DEVICE;
drm_via_cmdbuf_size_t d_siz; drm_via_cmdbuf_size_t d_siz;
......
...@@ -167,7 +167,7 @@ via_map_blit_for_device(struct pci_dev *pdev, ...@@ -167,7 +167,7 @@ via_map_blit_for_device(struct pci_dev *pdev,
*/ */
void static void
via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg)
{ {
struct page *page; struct page *page;
......
...@@ -110,11 +110,6 @@ extern int via_mem_free(DRM_IOCTL_ARGS); ...@@ -110,11 +110,6 @@ extern int via_mem_free(DRM_IOCTL_ARGS);
extern int via_agp_init(DRM_IOCTL_ARGS); extern int via_agp_init(DRM_IOCTL_ARGS);
extern int via_map_init(DRM_IOCTL_ARGS); extern int via_map_init(DRM_IOCTL_ARGS);
extern int via_decoder_futex(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_wait_irq(DRM_IOCTL_ARGS);
extern int via_dma_blit_sync( DRM_IOCTL_ARGS ); extern int via_dma_blit_sync( DRM_IOCTL_ARGS );
extern int via_dma_blit( DRM_IOCTL_ARGS ); extern int via_dma_blit( DRM_IOCTL_ARGS );
...@@ -139,8 +134,6 @@ extern int via_driver_dma_quiescent(drm_device_t * dev); ...@@ -139,8 +134,6 @@ extern int via_driver_dma_quiescent(drm_device_t * dev);
extern void via_init_futex(drm_via_private_t * dev_priv); 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_cleanup_futex(drm_via_private_t * dev_priv);
extern void via_release_futex(drm_via_private_t * dev_priv, int context); 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_dmablit_handler(drm_device_t *dev, int engine, int from_irq);
extern void via_init_dmablit(drm_device_t *dev); extern void via_init_dmablit(drm_device_t *dev);
......
...@@ -190,7 +190,7 @@ int via_driver_vblank_wait(drm_device_t * dev, unsigned int *sequence) ...@@ -190,7 +190,7 @@ int via_driver_vblank_wait(drm_device_t * dev, unsigned int *sequence)
return ret; return ret;
} }
int static int
via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence, via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence,
unsigned int *sequence) unsigned int *sequence)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment