diff options
Diffstat (limited to 'drivers/char/drm/drm_pci.c')
-rw-r--r-- | drivers/char/drm/drm_pci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/drm/drm_pci.c b/drivers/char/drm/drm_pci.c index 09ed712c1a7f..1fd7ff164817 100644 --- a/drivers/char/drm/drm_pci.c +++ b/drivers/char/drm/drm_pci.c | |||
@@ -77,7 +77,7 @@ drm_dma_handle_t *drm_pci_alloc(drm_device_t * dev, size_t size, size_t align, | |||
77 | dmah = kmalloc(sizeof(drm_dma_handle_t), GFP_KERNEL); | 77 | dmah = kmalloc(sizeof(drm_dma_handle_t), GFP_KERNEL); |
78 | if (!dmah) | 78 | if (!dmah) |
79 | return NULL; | 79 | return NULL; |
80 | 80 | ||
81 | dmah->size = size; | 81 | dmah->size = size; |
82 | dmah->vaddr = pci_alloc_consistent(dev->pdev, size, &dmah->busaddr); | 82 | dmah->vaddr = pci_alloc_consistent(dev->pdev, size, &dmah->busaddr); |
83 | 83 | ||
@@ -106,6 +106,7 @@ drm_dma_handle_t *drm_pci_alloc(drm_device_t * dev, size_t size, size_t align, | |||
106 | 106 | ||
107 | return dmah; | 107 | return dmah; |
108 | } | 108 | } |
109 | |||
109 | EXPORT_SYMBOL(drm_pci_alloc); | 110 | EXPORT_SYMBOL(drm_pci_alloc); |
110 | 111 | ||
111 | /** | 112 | /** |
@@ -113,8 +114,7 @@ EXPORT_SYMBOL(drm_pci_alloc); | |||
113 | * | 114 | * |
114 | * This function is for internal use in the Linux-specific DRM core code. | 115 | * This function is for internal use in the Linux-specific DRM core code. |
115 | */ | 116 | */ |
116 | void | 117 | void __drm_pci_free(drm_device_t * dev, drm_dma_handle_t * dmah) |
117 | __drm_pci_free(drm_device_t * dev, drm_dma_handle_t *dmah) | ||
118 | { | 118 | { |
119 | #ifdef DRM_DEBUG_MEMORY | 119 | #ifdef DRM_DEBUG_MEMORY |
120 | int area = DRM_MEM_DMA; | 120 | int area = DRM_MEM_DMA; |
@@ -150,12 +150,12 @@ __drm_pci_free(drm_device_t * dev, drm_dma_handle_t *dmah) | |||
150 | /** | 150 | /** |
151 | * \brief Free a PCI consistent memory block | 151 | * \brief Free a PCI consistent memory block |
152 | */ | 152 | */ |
153 | void | 153 | void drm_pci_free(drm_device_t * dev, drm_dma_handle_t * dmah) |
154 | drm_pci_free(drm_device_t *dev, drm_dma_handle_t *dmah) | ||
155 | { | 154 | { |
156 | __drm_pci_free(dev, dmah); | 155 | __drm_pci_free(dev, dmah); |
157 | kfree(dmah); | 156 | kfree(dmah); |
158 | } | 157 | } |
158 | |||
159 | EXPORT_SYMBOL(drm_pci_free); | 159 | EXPORT_SYMBOL(drm_pci_free); |
160 | 160 | ||
161 | /*@}*/ | 161 | /*@}*/ |