[AGPGART] Remove pointless enums from VIA GART driver.

drivers/char/agp/via-agp.c

@@ -179,7 +179,7 @@ static struct aper_size_info_16 via_generic_agp3_sizes[11] =
 static int __init via_generic_agp3_setup (struct pci_dev *pdev)
 {
 	agp_bridge->dev = pdev;
-	agp_bridge->type = VIA_APOLLO_KT400_3;
+	agp_bridge->type = VIA_GENERIC;
 	agp_bridge->masks = via_generic_masks;
 	agp_bridge->aperture_sizes = (void *) via_generic_agp3_sizes;
 	agp_bridge->size_type = U16_APER_SIZE;
@@ -282,101 +282,86 @@ static struct agp_device_ids via_agp_device_ids[] __initdata =
 {
 	{
 		.device_id	= PCI_DEVICE_ID_VIA_82C597_0,
-		.chipset	= VIA_VP3,
 		.chipset_name	= "VP3",
 	},
 
 	{
 		.device_id	= PCI_DEVICE_ID_VIA_82C598_0,
-		.chipset	= VIA_MVP3,
 		.chipset_name	= "MVP3",
 	},
 
 	{
 		.device_id	= PCI_DEVICE_ID_VIA_8501_0,
-		.chipset	= VIA_MVP4,
 		.chipset_name	= "MVP4",
 	},
 
 	/* VT8601 */
 /*	{
 		.device_id	= PCI_DEVICE_ID_VIA_8601_0,	// 0x0601
-		.chipset	= ,
 		.chipset_name	= "PLE133 ProMedia",
 	},*/
 
 	/* VT82C693A / VT28C694T */
 	{
 		.device_id	= PCI_DEVICE_ID_VIA_82C691,
-		.chipset	= VIA_APOLLO_PRO,
 		.chipset_name	= "Apollo Pro 133",
 	},
 
 	{
 		.device_id	= PCI_DEVICE_ID_VIA_8371_0,
-		.chipset	= VIA_APOLLO_KX133,
 		.chipset_name	= "Apollo Pro KX133",
 	},
 
 	/* VT8633 */
 	{
 		.device_id	= PCI_DEVICE_ID_VIA_8633_0,
-		.chipset	= VIA_APOLLO_PRO_266,
 		.chipset_name	= "Apollo Pro 266",
 	},
 
 	/* VT8361 */
 /*	{
 		.device_id	= PCI_DEVICE_ID_VIA_8361,	// 0x3112
-		.chipset	= ?,
 		.chipset_name	= "Apollo KLE133",
 	}, */
 
 	/* VT8365 / VT8362 */
 	{
 		.device_id	= PCI_DEVICE_ID_VIA_8363_0,
-		.chipset	= VIA_APOLLO_KT133,
 		.chipset_name	= "Apollo Pro KT133/KM133/TwisterK",
 	},
 
 	/* VT8753A */
 /*	{
 		.device_id	= PCI_DEVICE_ID_VIA_8753_0,	// 0x3128
-		.chipset	= VIA_P4X266,
 		.chipset_name	= "P4X266",
 	},	*/	
 
 	/* VT8366 */
 	{
 		.device_id	= PCI_DEVICE_ID_VIA_8367_0,
-		.chipset	= VIA_APOLLO_KT133,
 		.chipset_name	= "Apollo Pro KT266/KT333",
 	},
 
 	/* VT8633 (for CuMine/ Celeron) */
 	{
 		.device_id	= PCI_DEVICE_ID_VIA_8653_0,
-		.chipset	= VIA_APOLLO_PRO,
 		.chipset_name	= "Apollo Pro 266T",
 	},
 
 	/* KM266 / PM266 */
 /*	{
 		.device_id	= PCI_DEVICE_ID_VIA_KM266,	// 0x3116
-		.chipset	= VIA_KM266,
 		.chipset_name	= "KM266/PM266",
 	},	*/
 
 	/* CLE266 */
 /*	{
 		.device_id	= PCI_DEVICE_ID_VIA_CLE266,	// 0x3123
-		.chipset	= VIA_CLE266,
 		.chipset_name	= "CLE266",
 	},	*/
 
 	{
 		.device_id	= PCI_DEVICE_ID_VIA_8377_0,
-		.chipset	= VIA_APOLLO_KT400,
 		.chipset_name	= "Apollo Pro KT400",
 		.chipset_setup	= via_kt400_setup,
 	},
@@ -385,56 +370,48 @@ static struct agp_device_ids via_agp_device_ids[] __initdata =
 	 * (Apollo Pro133A chipset with S3 Savage4) */
 	{
 		.device_id	= PCI_DEVICE_ID_VIA_82C694X_0,
-		.chipset	= VIA_VT8605,
 		.chipset_name	= "Apollo ProSavage PM133/PL133/PN133/Twister"
 	},
 
 	/* VT8752*/
 /*	{
 		.device_id	= PCI_DEVICE_ID_VIA_8752,	// 0x3148
-		.chipset	= VIA_P4M266,
 		.chipset_name	= "ProSavage DDR P4M266",
 	},	*/
 
 	/* KN266/PN266 */
 /*	{
 		.device_id	= PCI_DEVICE_ID_KN266,	// 0x3156
-		.chipset	= VIA_KN266,
 		.chipset_name	= "KN266/PN266",
 	},	*/
 
 	/* VT8754 */
 	{
 		.device_id	= PCI_DEVICE_ID_VIA_8754,
-		.chipset	= VIA_P4X,
 		.chipset_name	= "Apollo P4X333/P4X400"
 	},
 
 	/* P4N333 */
 /*	{
 		.device_id	= PCI_DEVICE_ID_VIA_P4N333,	// 0x3178
-		.chipset	= VIA_P4N,
 		.chipset_name	= "P4N333",
 	}, */
 
 	/* P4X600 */
 /*	{
 		.device_id	= PCI_DEVICE_ID_VIA_P4X600,	// 0x0198
-		.chipset	= VIA_P4X600,
 		.chipset_name	= "P4X600",
 	},	*/
 
 	/* KM400 */
 /*	{
 		.device_id	= PCI_DEVICE_ID_VIA_KM400,	// 0x3205
-		.chipset	= VIA_KM400,
 		.chipset_name	= "KM400",
 	},	*/
 
 	/* P4M400 */
 /*	{
 		.device_id	= PCI_DEVICE_ID_VIA_P4M400,	// 0x3209
-		.chipset	= VIA_P4M400,
 		.chipset_name	= "PM400",
 	},	*/
 
@@ -453,7 +430,7 @@ static int __init agp_lookup_host_bridge (struct pci_dev *pdev)
 	while (devs[j].chipset_name != NULL) {
 		if (pdev->device == devs[j].device_id) {
 			printk (KERN_INFO PFX "Detected VIA %s chipset\n", devs[j].chipset_name);
-			agp_bridge->type = devs[j].chipset;
+			agp_bridge->type = VIA_GENERIC;
 
 			if (devs[j].chipset_setup != NULL)
 				return devs[j].chipset_setup(pdev);

include/linux/agp_backend.h

@@ -53,17 +53,6 @@ enum chipset_type {
 	INTEL_460GX,
 	INTEL_I7505,
 	VIA_GENERIC,
-	VIA_VP3,
-	VIA_MVP3,
-	VIA_MVP4,
-	VIA_APOLLO_PRO,
-	VIA_APOLLO_KX133,
-	VIA_APOLLO_KT133,
-	VIA_APOLLO_KT400,
-	VIA_APOLLO_KT400_3,
-	VIA_APOLLO_PRO_266,
-	VIA_VT8605,
-	VIA_P4X,
 	SIS_GENERIC,
 	AMD_GENERIC,
 	AMD_IRONGATE,