These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / i2c / gf117.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf117.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf117.c
index e290b40..ae4aad3 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf117.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf117.c
@@ -21,18 +21,16 @@
  *
  * Authors: Ben Skeggs
  */
-#include "nv50.h"
+#include "priv.h"
+#include "pad.h"
 
-struct nvkm_oclass *
-gf117_i2c_oclass = &(struct nvkm_i2c_impl) {
-       .base.handle = NV_SUBDEV(I2C, 0xd7),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = _nvkm_i2c_ctor,
-               .dtor = _nvkm_i2c_dtor,
-               .init = _nvkm_i2c_init,
-               .fini = _nvkm_i2c_fini,
-       },
-       .sclass = gf110_i2c_sclass,
-       .pad_x = &nv04_i2c_pad_oclass,
-       .pad_s = &nv04_i2c_pad_oclass,
-}.base;
+static const struct nvkm_i2c_func
+gf117_i2c = {
+       .pad_x_new = gf119_i2c_pad_x_new,
+};
+
+int
+gf117_i2c_new(struct nvkm_device *device, int index, struct nvkm_i2c **pi2c)
+{
+       return nvkm_i2c_new_(&gf117_i2c, device, index, pi2c);
+}