Merge branch 'master' of ../linux-2.6/

[linux-2.6] / drivers / char / drm / via_verifier.c

diff --git a/drivers/char/drm/via_verifier.c b/drivers/char/drm/via_verifier.c
index 8b4ea3027b2cd605e2a6b64e18be13fb71e31a08..46a57919874797b3b41d694b1ab70159a6f3e13e 100644 (file)
--- a/drivers/char/drm/via_verifier.c
+++ b/drivers/char/drm/via_verifier.c
@@ -252,9 +252,9 @@ eat_words(const uint32_t ** buf, const uint32_t * buf_end, unsigned num_words)
 static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq,
                                                    unsigned long offset,
                                                    unsigned long size,
-                                                   drm_device_t * dev)
+                                                   struct drm_device * dev)
 {
-       drm_map_list_t *r_list;
+       struct drm_map_list *r_list;
        drm_local_map_t *map = seq->map_cache;
 
        if (map && map->offset <= offset
@@ -962,7 +962,7 @@ via_parse_vheader6(drm_via_private_t * dev_priv, uint32_t const **buffer,
 
 int
 via_verify_command_stream(const uint32_t * buf, unsigned int size,
-                         drm_device_t * dev, int agp)
+                         struct drm_device * dev, int agp)
 {
 
        drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
@@ -1026,18 +1026,18 @@ via_verify_command_stream(const uint32_t * buf, unsigned int size,
                case state_error:
                default:
                        *hc_state = saved_state;
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
        }
        if (state == state_error) {
                *hc_state = saved_state;
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        return 0;
 }
 
 int
-via_parse_command_stream(drm_device_t * dev, const uint32_t * buf,
+via_parse_command_stream(struct drm_device * dev, const uint32_t * buf,
                         unsigned int size)
 {
 
@@ -1082,11 +1082,11 @@ via_parse_command_stream(drm_device_t * dev, const uint32_t * buf,
                        break;
                case state_error:
                default:
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
        }
        if (state == state_error) {
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        return 0;
 }