drm/nv50-/i2c: kill some unused struct members

Left-over from before a rework a while back.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/nv50.h b/drivers/gpu/drm/nouveau/core/subdev/i2c/nv50.h
index 5d2a774..290cf7d 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/nv50.h
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/nv50.h
@@ -10,8 +10,6 @@ struct nv50_i2c_priv {
 struct nv50_i2c_port {
        struct nouveau_i2c_port base;
        u32 addr;
-       u32 ctrl;
-       u32 data;
        u32 state;
 };
 

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/nv94.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/nv94.c
index f59c3a2..60fdd48 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/nv94.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/nv94.c
@@ -214,10 +214,6 @@ nv94_i2c_port_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
 
        port->state = 7;
        port->addr = nv50_i2c_addr[info->drive];
-       if (info->share != DCB_I2C_UNUSED) {
-               port->ctrl = 0x00e500 + (info->share * 0x50);
-               port->data = 0x0000e001;
-       }
        return 0;
 }
 
@@ -244,11 +240,6 @@ nv94_aux_port_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
 
        port->base.aux = info->drive;
        port->addr = info->drive;
-       if (info->share != DCB_I2C_UNUSED) {
-               port->ctrl = 0x00e500 + (info->drive * 0x50);
-               port->data = 0x00002002;
-       }
-
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c
index 364ddb1..ff50ed7 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c
@@ -66,10 +66,6 @@ nvd0_i2c_port_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
 
        port->state = 0x00000007;
        port->addr = 0x00d014 + (info->drive * 0x20);
-       if (info->share != DCB_I2C_UNUSED) {
-               port->ctrl = 0x00e500 + (info->share * 0x50);
-               port->data = 0x0000e001;
-       }
        return 0;
 }