diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2014-12-05 12:03:55 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-10 23:57:07 +1000 |
commit | 7101a897d09bf98a38bf7998295bc0a6070b4ab8 (patch) | |
tree | 419d7c4de17307df8f37a83f4fdec58f53c92132 /nvkm/subdev/i2c/nv50.c | |
parent | 0f6561990f72040d69a3d8bf757769ec20f017ac (diff) | |
download | nouveau-7101a897d09bf98a38bf7998295bc0a6070b4ab8.tar.gz |
i2c: pad/ports do not have an engine
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'nvkm/subdev/i2c/nv50.c')
-rw-r--r-- | nvkm/subdev/i2c/nv50.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nvkm/subdev/i2c/nv50.c b/nvkm/subdev/i2c/nv50.c index 7b8756d4d..33dd89f5c 100644 --- a/nvkm/subdev/i2c/nv50.c +++ b/nvkm/subdev/i2c/nv50.c @@ -27,7 +27,7 @@ void nv50_i2c_drive_scl(struct nouveau_i2c_port *base, int state) { - struct nv50_i2c_priv *priv = (void *)nv_object(base)->engine; + struct nv50_i2c_priv *priv = (void *)nouveau_i2c(base); struct nv50_i2c_port *port = (void *)base; if (state) port->state |= 0x01; else port->state &= 0xfe; @@ -37,7 +37,7 @@ nv50_i2c_drive_scl(struct nouveau_i2c_port *base, int state) void nv50_i2c_drive_sda(struct nouveau_i2c_port *base, int state) { - struct nv50_i2c_priv *priv = (void *)nv_object(base)->engine; + struct nv50_i2c_priv *priv = (void *)nouveau_i2c(base); struct nv50_i2c_port *port = (void *)base; if (state) port->state |= 0x02; else port->state &= 0xfd; @@ -47,7 +47,7 @@ nv50_i2c_drive_sda(struct nouveau_i2c_port *base, int state) int nv50_i2c_sense_scl(struct nouveau_i2c_port *base) { - struct nv50_i2c_priv *priv = (void *)nv_object(base)->engine; + struct nv50_i2c_priv *priv = (void *)nouveau_i2c(base); struct nv50_i2c_port *port = (void *)base; return !!(nv_rd32(priv, port->addr) & 0x00000001); } @@ -55,7 +55,7 @@ nv50_i2c_sense_scl(struct nouveau_i2c_port *base) int nv50_i2c_sense_sda(struct nouveau_i2c_port *base) { - struct nv50_i2c_priv *priv = (void *)nv_object(base)->engine; + struct nv50_i2c_priv *priv = (void *)nouveau_i2c(base); struct nv50_i2c_port *port = (void *)base; return !!(nv_rd32(priv, port->addr) & 0x00000002); } @@ -102,7 +102,7 @@ nv50_i2c_port_ctor(struct nouveau_object *parent, struct nouveau_object *engine, int nv50_i2c_port_init(struct nouveau_object *object) { - struct nv50_i2c_priv *priv = (void *)object->engine; + struct nv50_i2c_priv *priv = (void *)nouveau_i2c(object); struct nv50_i2c_port *port = (void *)object; nv_wr32(priv, port->addr, port->state); return nouveau_i2c_port_init(&port->base); |