Commit cf336014 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/devinit: tidy up the subdev class definition 



Reviewed-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 52225551

drivers/gpu/drm/nouveau/core/engine/device/nv04.c

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv04_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv04_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -67,7 +67,7 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv05_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv05_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

drivers/gpu/drm/nouveau/core/engine/device/nv10.c

+8 −8
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -68,7 +68,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -87,7 +87,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -106,7 +106,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -125,7 +125,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -144,7 +144,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -163,7 +163,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -182,7 +182,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

drivers/gpu/drm/nouveau/core/engine/device/nv20.c

+4 −4
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -71,7 +71,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -90,7 +90,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -109,7 +109,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

drivers/gpu/drm/nouveau/core/engine/device/nv30.c

+5 −5
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -71,7 +71,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -90,7 +90,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -110,7 +110,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -130,7 +130,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

drivers/gpu/drm/nouveau/core/engine/device/nv40.c

+16 −16
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -80,7 +80,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -103,7 +103,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -126,7 +126,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -149,7 +149,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -172,7 +172,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -195,7 +195,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -218,7 +218,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv40_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -241,7 +241,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -264,7 +264,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -287,7 +287,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -310,7 +310,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -333,7 +333,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv4e_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -356,7 +356,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -379,7 +379,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -402,7 +402,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;