3 files changed, 19 insertions, 22 deletions
diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h
index 7d505c48ab3..45c05e46c9d 100644
--- a/sys/dev/pci/drm/drmP.h
+++ b/sys/dev/pci/drm/drmP.h
@@ -192,7 +192,6 @@ extern int ticks;		/* really should be in a header */
 #define DRM_AGP_FIND_DEVICE()	agp_find_device(0)
 #endif
 
-typedef drm_device_t *device_t;
 extern struct cfdriver drm_cd;
 
 /* Capabilities taken from src/sys/dev/pci/pcireg.h. */
@@ -232,8 +231,6 @@ typedef u_int8_t u8;
 					"lock; addl $0,0(%%rsp)" : : : "memory");
 #endif
 
-typedef vaddr_t vm_offset_t;
-
 #define DRM_READ8(map, offset)		\
 	bus_space_read_1( (map)->bst, (map)->bsh, (offset))
 #define DRM_READ16(map, offset)		\
@@ -445,17 +442,17 @@ struct drm_agp_mem {
 };
 
 typedef struct drm_agp_head {
-	device_t	   agpdev;
-	struct agp_info    info;
-	const char         *chipset;
-	TAILQ_HEAD(agp_memlist, drm_agp_mem) memory;
-	unsigned long      mode;
-	int                enabled;
-	int                acquired;
-	unsigned long      base;
-   	int 		   mtrr;
-	int		   cant_use_aperture;
-	unsigned long	   page_mask;
+	struct device				*agpdev;
+	const char				*chipset;
+	TAILQ_HEAD(agp_memlist, drm_agp_mem)	 memory;
+	struct agp_info				 info;
+	unsigned long				 base;
+	unsigned long				 mode;
+	unsigned long				 page_mask;
+	int					 acquired;
+	int					 cant_use_aperture;
+	int					 enabled;
+   	int					 mtrr;
 } drm_agp_head_t;
 
 struct drm_sg_dmamem {
diff --git a/sys/dev/pci/drm/drm_agpsupport.c b/sys/dev/pci/drm/drm_agpsupport.c
index eb1ce1fd1fe..556da947d24 100644
--- a/sys/dev/pci/drm/drm_agpsupport.c
+++ b/sys/dev/pci/drm/drm_agpsupport.c
@@ -369,7 +369,7 @@ drm_agp_free_ioctl(drm_device_t *dev, void *data, struct drm_file *file_priv)
 drm_agp_head_t *
 drm_agp_init(void)
 {
-	device_t agpdev;
+	struct device *agpdev;
 	drm_agp_head_t *head = NULL;
 	int agp_available = 1;
    
@@ -399,7 +399,7 @@ drm_agp_init(void)
 void *
 drm_agp_allocate_memory(size_t pages, u32 type)
 {
-	device_t agpdev;
+	struct device *agpdev;
 
 	agpdev = DRM_AGP_FIND_DEVICE();
 	if (!agpdev)
@@ -411,7 +411,7 @@ drm_agp_allocate_memory(size_t pages, u32 type)
 int
 drm_agp_free_memory(void *handle)
 {
-	device_t agpdev;
+	struct device *agpdev;
 
 	agpdev = DRM_AGP_FIND_DEVICE();
 	if (!agpdev || !handle)
@@ -425,7 +425,7 @@ int
 drm_agp_bind_memory(void *handle, off_t start)
 {
 #ifndef DRM_NO_AGP
-	device_t agpdev;
+	struct device *agpdev;
 
 	agpdev = DRM_AGP_FIND_DEVICE();
 	if (!agpdev || !handle)
@@ -441,7 +441,7 @@ int
 drm_agp_unbind_memory(void *handle)
 {
 #ifndef DRM_NO_AGP
-	device_t agpdev;
+	struct device *agpdev;
 
 	agpdev = DRM_AGP_FIND_DEVICE();
 	if (!agpdev || !handle)
diff --git a/sys/dev/pci/drm/drm_bufs.c b/sys/dev/pci/drm/drm_bufs.c
index 4ac51ef6548..efecd388f1b 100644
--- a/sys/dev/pci/drm/drm_bufs.c
+++ b/sys/dev/pci/drm/drm_bufs.c
@@ -1065,14 +1065,14 @@ int
 drm_mapbufs(drm_device_t *dev, void *data, struct drm_file *file_priv)
 {
 	drm_device_dma_t *dma = dev->dma;
-	int retcode = 0;
-	const int zero = 0;
-	vm_offset_t address;
 	struct vmspace *vms;
 	struct vnode *vn;
+	vaddr_t address;
 	voff_t foff;
 	vsize_t size;
 	vaddr_t vaddr;
+	int retcode = 0;
+	const int zero = 0;
 
 	drm_buf_map_t *request = data;
 	int i;