[AGPGART] Kill off some typedefs.

Note, I'm leaving behind the ones not in #ifdef __KERNEL__ for now, as I'm
not sure just what userspace stuff that might break.

include/linux/agpgart.h

@@ -27,17 +27,19 @@
 #ifndef _AGP_H
 #define _AGP_H 1
 
+#include <linux/agp_backend.h>
+
 #define AGPIOC_BASE       'A'
-#define AGPIOC_INFO       _IOR (AGPIOC_BASE, 0, agp_info*)
+#define AGPIOC_INFO       _IOR (AGPIOC_BASE, 0, struct agp_info*)
 #define AGPIOC_ACQUIRE    _IO  (AGPIOC_BASE, 1)
 #define AGPIOC_RELEASE    _IO  (AGPIOC_BASE, 2)
-#define AGPIOC_SETUP      _IOW (AGPIOC_BASE, 3, agp_setup*)
-#define AGPIOC_RESERVE    _IOW (AGPIOC_BASE, 4, agp_region*)
-#define AGPIOC_PROTECT    _IOW (AGPIOC_BASE, 5, agp_region*)
-#define AGPIOC_ALLOCATE   _IOWR(AGPIOC_BASE, 6, agp_allocate*)
+#define AGPIOC_SETUP      _IOW (AGPIOC_BASE, 3, struct agp_setup*)
+#define AGPIOC_RESERVE    _IOW (AGPIOC_BASE, 4, struct agp_region*)
+#define AGPIOC_PROTECT    _IOW (AGPIOC_BASE, 5, struct agp_region*)
+#define AGPIOC_ALLOCATE   _IOWR(AGPIOC_BASE, 6, struct agp_allocate*)
 #define AGPIOC_DEALLOCATE _IOW (AGPIOC_BASE, 7, int)
-#define AGPIOC_BIND       _IOW (AGPIOC_BASE, 8, agp_bind*)
-#define AGPIOC_UNBIND     _IOW (AGPIOC_BASE, 9, agp_unbind*)
+#define AGPIOC_BIND       _IOW (AGPIOC_BASE, 8, struct agp_bind*)
+#define AGPIOC_UNBIND     _IOW (AGPIOC_BASE, 9, struct agp_unbind*)
 
 #define AGP_DEVICE      "/dev/agpgart"
 
@@ -112,15 +114,7 @@ typedef struct _agp_unbind {
 
 #define AGPGART_MINOR 175
 
-#ifndef _AGP_BACKEND_H
-struct _agp_version {
-	u16 major;
-	u16 minor;
-} agp_version;
-
-#endif
-
-typedef struct _agp_info {
+struct agp_info {
 	struct agp_version version;	/* version of the driver        */
 	u32 bridge_id;		/* bridge vendor/device         */
 	u32 agp_mode;		/* mode info of bridge          */
@@ -129,34 +123,34 @@ typedef struct _agp_info {
 	size_t pg_total;	/* max pages (swap + system)    */
 	size_t pg_system;	/* max pages (system)           */
 	size_t pg_used;		/* current pages used           */
-} agp_info;
+};
 
-typedef struct _agp_setup {
+struct agp_setup {
 	u32 agp_mode;		/* mode info of bridge          */
-} agp_setup;
+};
 
 /*
  * The "prot" down below needs still a "sleep" flag somehow ...
  */
-typedef struct _agp_segment {
+struct agp_segment {
 	off_t pg_start;		/* starting page to populate    */
 	size_t pg_count;	/* number of pages              */
 	int prot;		/* prot flags for mmap          */
-} agp_segment;
+};
 
-typedef struct _agp_segment_priv {
+struct agp_segment_priv {
 	off_t pg_start;
 	size_t pg_count;
 	pgprot_t prot;
-} agp_segment_priv;
+};
 
-typedef struct _agp_region {
+struct agp_region {
 	pid_t pid;		/* pid of process               */
 	size_t seg_count;	/* number of segments           */
-	struct _agp_segment *seg_list;
-} agp_region;
+	struct agp_segment *seg_list;
+};
 
-typedef struct _agp_allocate {
+struct agp_allocate {
 	int key;		/* tag of allocation            */
 	size_t pg_count;	/* number of pages              */
 	u32 type;		/* 0 == normal, other devspec   */
@@ -164,34 +158,34 @@ typedef struct _agp_allocate {
 				 * need a phys address of the     
 				 * actual page behind the gatt    
 				 * table)                        */
-} agp_allocate;
+};
 
-typedef struct _agp_bind {
+struct agp_bind {
 	int key;		/* tag of allocation            */
 	off_t pg_start;		/* starting page to populate    */
-} agp_bind;
+};
 
-typedef struct _agp_unbind {
+struct agp_unbind {
 	int key;		/* tag of allocation            */
 	u32 priority;		/* priority for paging out      */
-} agp_unbind;
+};
 
-typedef struct _agp_client {
-	struct _agp_client *next;
-	struct _agp_client *prev;
+struct agp_client {
+	struct agp_client *next;
+	struct agp_client *prev;
 	pid_t pid;
 	int num_segments;
-	agp_segment_priv **segments;
-} agp_client;
+	struct agp_segment_priv **segments;
+};
 
-typedef struct _agp_controller {
-	struct _agp_controller *next;
-	struct _agp_controller *prev;
+struct agp_controller {
+	struct agp_controller *next;
+	struct agp_controller *prev;
 	pid_t pid;
 	int num_clients;
 	agp_memory *pool;
-	agp_client *clients;
-} agp_controller;
+	struct agp_client *clients;
+};
 
 #define AGP_FF_ALLOW_CLIENT		0
 #define AGP_FF_ALLOW_CONTROLLER 	1
@@ -199,18 +193,18 @@ typedef struct _agp_controller {
 #define AGP_FF_IS_CONTROLLER		3
 #define AGP_FF_IS_VALID 		4
 
-typedef struct _agp_file_private {
-	struct _agp_file_private *next;
-	struct _agp_file_private *prev;
+struct agp_file_private {
+	struct agp_file_private *next;
+	struct agp_file_private *prev;
 	pid_t my_pid;
 	long access_flags;	/* long req'd for set_bit --RR */
-} agp_file_private;
+};
 
 struct agp_front_data {
 	struct semaphore agp_mutex;
-	agp_controller *current_controller;
-	agp_controller *controllers;
-	agp_file_private *file_priv_list;
+	struct agp_controller *current_controller;
+	struct agp_controller *controllers;
+	struct agp_file_private *file_priv_list;
 	u8 used_by_controller;
 	u8 backend_acquired;
 };