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

drm/nouveau/gpio: use indirect pointer to base class definition 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 1f86ca1a

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

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ gm100_identify(struct nouveau_device *device) 
	case 0x117:

		device->cname = "GM107";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

#if 0

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

+8 −8
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ nv10_identify(struct nouveau_device *device) 
	case 0x10:

		device->cname = "NV10";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;
@@ -65,7 +65,7 @@ nv10_identify(struct nouveau_device *device) 
	case 0x15:

		device->cname = "NV15";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;
@@ -84,7 +84,7 @@ nv10_identify(struct nouveau_device *device) 
	case 0x16:

		device->cname = "NV16";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;
@@ -103,7 +103,7 @@ nv10_identify(struct nouveau_device *device) 
	case 0x1a:

		device->cname = "nForce";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;
@@ -122,7 +122,7 @@ nv10_identify(struct nouveau_device *device) 
	case 0x11:

		device->cname = "NV11";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;
@@ -141,7 +141,7 @@ nv10_identify(struct nouveau_device *device) 
	case 0x17:

		device->cname = "NV17";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;
@@ -160,7 +160,7 @@ nv10_identify(struct nouveau_device *device) 
	case 0x1f:

		device->cname = "nForce2";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;
@@ -179,7 +179,7 @@ nv10_identify(struct nouveau_device *device) 
	case 0x18:

		device->cname = "NV18";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;

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

+4 −4
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ nv20_identify(struct nouveau_device *device) 
	case 0x20:

		device->cname = "NV20";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;
@@ -68,7 +68,7 @@ nv20_identify(struct nouveau_device *device) 
	case 0x25:

		device->cname = "NV25";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;
@@ -87,7 +87,7 @@ nv20_identify(struct nouveau_device *device) 
	case 0x28:

		device->cname = "NV28";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;
@@ -106,7 +106,7 @@ nv20_identify(struct nouveau_device *device) 
	case 0x2a:

		device->cname = "NV2A";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;

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

+5 −5
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ nv30_identify(struct nouveau_device *device) 
	case 0x30:

		device->cname = "NV30";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;
@@ -68,7 +68,7 @@ nv30_identify(struct nouveau_device *device) 
	case 0x35:

		device->cname = "NV35";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;
@@ -87,7 +87,7 @@ nv30_identify(struct nouveau_device *device) 
	case 0x31:

		device->cname = "NV31";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;
@@ -107,7 +107,7 @@ nv30_identify(struct nouveau_device *device) 
	case 0x36:

		device->cname = "NV36";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;
@@ -127,7 +127,7 @@ nv30_identify(struct nouveau_device *device) 
	case 0x34:

		device->cname = "NV34";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		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;

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

+16 −16
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x40:

		device->cname = "NV40";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -76,7 +76,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x41:

		device->cname = "NV41";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -99,7 +99,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x42:

		device->cname = "NV42";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -122,7 +122,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x43:

		device->cname = "NV43";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -145,7 +145,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x45:

		device->cname = "NV45";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -168,7 +168,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x47:

		device->cname = "G70";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -191,7 +191,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x49:

		device->cname = "G71";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -214,7 +214,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x4b:

		device->cname = "G73";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -237,7 +237,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x44:

		device->cname = "NV44";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -260,7 +260,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x46:

		device->cname = "G72";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -283,7 +283,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x4a:

		device->cname = "NV44A";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -306,7 +306,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x4c:

		device->cname = "C61";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -329,7 +329,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x4e:

		device->cname = "C51";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv4e_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -352,7 +352,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x63:

		device->cname = "C73";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -375,7 +375,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x67:

		device->cname = "C67";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
@@ -398,7 +398,7 @@ nv40_identify(struct nouveau_device *device) 
	case 0x68:

		device->cname = "C68";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;