diff options
Diffstat (limited to 'drivers/char/drm/via_verifier.c')
-rw-r--r-- | drivers/char/drm/via_verifier.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/char/drm/via_verifier.c b/drivers/char/drm/via_verifier.c index 2e7e08078287..832d48356e91 100644 --- a/drivers/char/drm/via_verifier.c +++ b/drivers/char/drm/via_verifier.c | |||
@@ -252,10 +252,9 @@ eat_words(const uint32_t ** buf, const uint32_t * buf_end, unsigned num_words) | |||
252 | static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq, | 252 | static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq, |
253 | unsigned long offset, | 253 | unsigned long offset, |
254 | unsigned long size, | 254 | unsigned long size, |
255 | drm_device_t * dev) | 255 | struct drm_device * dev) |
256 | { | 256 | { |
257 | struct list_head *list; | 257 | struct drm_map_list *r_list; |
258 | drm_map_list_t *r_list; | ||
259 | drm_local_map_t *map = seq->map_cache; | 258 | drm_local_map_t *map = seq->map_cache; |
260 | 259 | ||
261 | if (map && map->offset <= offset | 260 | if (map && map->offset <= offset |
@@ -263,8 +262,7 @@ static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq, | |||
263 | return map; | 262 | return map; |
264 | } | 263 | } |
265 | 264 | ||
266 | list_for_each(list, &dev->maplist->head) { | 265 | list_for_each_entry(r_list, &dev->maplist, head) { |
267 | r_list = (drm_map_list_t *) list; | ||
268 | map = r_list->map; | 266 | map = r_list->map; |
269 | if (!map) | 267 | if (!map) |
270 | continue; | 268 | continue; |
@@ -964,7 +962,7 @@ via_parse_vheader6(drm_via_private_t * dev_priv, uint32_t const **buffer, | |||
964 | 962 | ||
965 | int | 963 | int |
966 | via_verify_command_stream(const uint32_t * buf, unsigned int size, | 964 | via_verify_command_stream(const uint32_t * buf, unsigned int size, |
967 | drm_device_t * dev, int agp) | 965 | struct drm_device * dev, int agp) |
968 | { | 966 | { |
969 | 967 | ||
970 | drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; | 968 | drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; |
@@ -1039,7 +1037,7 @@ via_verify_command_stream(const uint32_t * buf, unsigned int size, | |||
1039 | } | 1037 | } |
1040 | 1038 | ||
1041 | int | 1039 | int |
1042 | via_parse_command_stream(drm_device_t * dev, const uint32_t * buf, | 1040 | via_parse_command_stream(struct drm_device * dev, const uint32_t * buf, |
1043 | unsigned int size) | 1041 | unsigned int size) |
1044 | { | 1042 | { |
1045 | 1043 | ||