diff options
Diffstat (limited to 'drivers/char/drm/drm_sman.c')
-rw-r--r-- | drivers/char/drm/drm_sman.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/drm/drm_sman.c b/drivers/char/drm/drm_sman.c index e15db6d6bea9..8e4bfbd89632 100644 --- a/drivers/char/drm/drm_sman.c +++ b/drivers/char/drm/drm_sman.c | |||
@@ -88,8 +88,8 @@ EXPORT_SYMBOL(drm_sman_init); | |||
88 | static void *drm_sman_mm_allocate(void *private, unsigned long size, | 88 | static void *drm_sman_mm_allocate(void *private, unsigned long size, |
89 | unsigned alignment) | 89 | unsigned alignment) |
90 | { | 90 | { |
91 | drm_mm_t *mm = (drm_mm_t *) private; | 91 | struct drm_mm *mm = (struct drm_mm *) private; |
92 | drm_mm_node_t *tmp; | 92 | struct drm_mm_node *tmp; |
93 | 93 | ||
94 | tmp = drm_mm_search_free(mm, size, alignment, 1); | 94 | tmp = drm_mm_search_free(mm, size, alignment, 1); |
95 | if (!tmp) { | 95 | if (!tmp) { |
@@ -101,21 +101,21 @@ static void *drm_sman_mm_allocate(void *private, unsigned long size, | |||
101 | 101 | ||
102 | static void drm_sman_mm_free(void *private, void *ref) | 102 | static void drm_sman_mm_free(void *private, void *ref) |
103 | { | 103 | { |
104 | drm_mm_node_t *node = (drm_mm_node_t *) ref; | 104 | struct drm_mm_node *node = (struct drm_mm_node *) ref; |
105 | 105 | ||
106 | drm_mm_put_block(node); | 106 | drm_mm_put_block(node); |
107 | } | 107 | } |
108 | 108 | ||
109 | static void drm_sman_mm_destroy(void *private) | 109 | static void drm_sman_mm_destroy(void *private) |
110 | { | 110 | { |
111 | drm_mm_t *mm = (drm_mm_t *) private; | 111 | struct drm_mm *mm = (struct drm_mm *) private; |
112 | drm_mm_takedown(mm); | 112 | drm_mm_takedown(mm); |
113 | drm_free(mm, sizeof(*mm), DRM_MEM_MM); | 113 | drm_free(mm, sizeof(*mm), DRM_MEM_MM); |
114 | } | 114 | } |
115 | 115 | ||
116 | static unsigned long drm_sman_mm_offset(void *private, void *ref) | 116 | static unsigned long drm_sman_mm_offset(void *private, void *ref) |
117 | { | 117 | { |
118 | drm_mm_node_t *node = (drm_mm_node_t *) ref; | 118 | struct drm_mm_node *node = (struct drm_mm_node *) ref; |
119 | return node->start; | 119 | return node->start; |
120 | } | 120 | } |
121 | 121 | ||
@@ -124,7 +124,7 @@ drm_sman_set_range(drm_sman_t * sman, unsigned int manager, | |||
124 | unsigned long start, unsigned long size) | 124 | unsigned long start, unsigned long size) |
125 | { | 125 | { |
126 | drm_sman_mm_t *sman_mm; | 126 | drm_sman_mm_t *sman_mm; |
127 | drm_mm_t *mm; | 127 | struct drm_mm *mm; |
128 | int ret; | 128 | int ret; |
129 | 129 | ||
130 | BUG_ON(manager >= sman->num_managers); | 130 | BUG_ON(manager >= sman->num_managers); |