drm/nouveau/i2c: pad/ports do not have an engine

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

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c
index e5f1ffa..d1f06e9 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c
@@ -117,8 +117,8 @@ nouveau_i2c_port_create_(struct nouveau_object *parent,
                         const struct nouveau_i2c_func *func,
                         int size, void **pobject)
 {
-       struct nouveau_device *device = nv_device(engine);
-       struct nouveau_i2c *i2c = (void *)engine;
+       struct nouveau_device *device = nv_device(parent);
+       struct nouveau_i2c *i2c = nouveau_i2c(parent);
        struct nouveau_i2c_port *port;
        int ret;
 
@@ -494,7 +494,7 @@ nouveau_i2c_create_port(struct nouveau_i2c *i2c, int index, u8 type,
                oclass = impl->pad_x;
        }
 
-       ret = nouveau_object_ctor(nv_object(i2c), nv_object(i2c), oclass,
+       ret = nouveau_object_ctor(nv_object(i2c), NULL, oclass,
                                  NULL, pad, &parent);
        if (ret < 0)
                return;
@@ -503,7 +503,7 @@ nouveau_i2c_create_port(struct nouveau_i2c *i2c, int index, u8 type,
        do {
                ret = -EINVAL;
                if (oclass->handle == type) {
-                       ret = nouveau_object_ctor(parent, nv_object(i2c),
+                       ret = nouveau_object_ctor(parent, NULL,
                                                  oclass, info, index,
                                                 &object);
                }
@@ -603,7 +603,7 @@ nouveau_i2c_create_(struct nouveau_object *parent,
                        do {
                                if (oclass->handle != info.type)
                                        continue;
-                               ret = nouveau_object_ctor(parent, *pobject,
+                               ret = nouveau_object_ctor(parent, NULL,
                                                          oclass, NULL,
                                                          index++, &object);
                        } while (ret && (++oclass)->handle);

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/nv04.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/nv04.c
index b1725bd..0db5de6 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/nv04.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/nv04.c
@@ -39,7 +39,7 @@ struct nv04_i2c_port {
 static void
 nv04_i2c_drive_scl(struct nouveau_i2c_port *base, int state)
 {
-       struct nv04_i2c_priv *priv = (void *)nv_object(base)->engine;
+       struct nv04_i2c_priv *priv = (void *)nouveau_i2c(base);
        struct nv04_i2c_port *port = (void *)base;
        u8 val = nv_rdvgac(priv, 0, port->drive);
        if (state) val |= 0x20;
@@ -50,7 +50,7 @@ nv04_i2c_drive_scl(struct nouveau_i2c_port *base, int state)
 static void
 nv04_i2c_drive_sda(struct nouveau_i2c_port *base, int state)
 {
-       struct nv04_i2c_priv *priv = (void *)nv_object(base)->engine;
+       struct nv04_i2c_priv *priv = (void *)nouveau_i2c(base);
        struct nv04_i2c_port *port = (void *)base;
        u8 val = nv_rdvgac(priv, 0, port->drive);
        if (state) val |= 0x10;
@@ -61,7 +61,7 @@ nv04_i2c_drive_sda(struct nouveau_i2c_port *base, int state)
 static int
 nv04_i2c_sense_scl(struct nouveau_i2c_port *base)
 {
-       struct nv04_i2c_priv *priv = (void *)nv_object(base)->engine;
+       struct nv04_i2c_priv *priv = (void *)nouveau_i2c(base);
        struct nv04_i2c_port *port = (void *)base;
        return !!(nv_rdvgac(priv, 0, port->sense) & 0x04);
 }
@@ -69,7 +69,7 @@ nv04_i2c_sense_scl(struct nouveau_i2c_port *base)
 static int
 nv04_i2c_sense_sda(struct nouveau_i2c_port *base)
 {
-       struct nv04_i2c_priv *priv = (void *)nv_object(base)->engine;
+       struct nv04_i2c_priv *priv = (void *)nouveau_i2c(base);
        struct nv04_i2c_port *port = (void *)base;
        return !!(nv_rdvgac(priv, 0, port->sense) & 0x08);
 }

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/nv4e.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/nv4e.c
index f16c87c..0d78389 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/nv4e.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/nv4e.c
@@ -38,7 +38,7 @@ struct nv4e_i2c_port {
 static void
 nv4e_i2c_drive_scl(struct nouveau_i2c_port *base, int state)
 {
-       struct nv4e_i2c_priv *priv = (void *)nv_object(base)->engine;
+       struct nv4e_i2c_priv *priv = (void *)nouveau_i2c(base);
        struct nv4e_i2c_port *port = (void *)base;
        nv_mask(priv, port->addr, 0x2f, state ? 0x21 : 0x01);
 }
@@ -46,7 +46,7 @@ nv4e_i2c_drive_scl(struct nouveau_i2c_port *base, int state)
 static void
 nv4e_i2c_drive_sda(struct nouveau_i2c_port *base, int state)
 {
-       struct nv4e_i2c_priv *priv = (void *)nv_object(base)->engine;
+       struct nv4e_i2c_priv *priv = (void *)nouveau_i2c(base);
        struct nv4e_i2c_port *port = (void *)base;
        nv_mask(priv, port->addr, 0x1f, state ? 0x11 : 0x01);
 }
@@ -54,7 +54,7 @@ nv4e_i2c_drive_sda(struct nouveau_i2c_port *base, int state)
 static int
 nv4e_i2c_sense_scl(struct nouveau_i2c_port *base)
 {
-       struct nv4e_i2c_priv *priv = (void *)nv_object(base)->engine;
+       struct nv4e_i2c_priv *priv = (void *)nouveau_i2c(base);
        struct nv4e_i2c_port *port = (void *)base;
        return !!(nv_rd32(priv, port->addr) & 0x00040000);
 }
@@ -62,7 +62,7 @@ nv4e_i2c_sense_scl(struct nouveau_i2c_port *base)
 static int
 nv4e_i2c_sense_sda(struct nouveau_i2c_port *base)
 {
-       struct nv4e_i2c_priv *priv = (void *)nv_object(base)->engine;
+       struct nv4e_i2c_priv *priv = (void *)nouveau_i2c(base);
        struct nv4e_i2c_port *port = (void *)base;
        return !!(nv_rd32(priv, port->addr) & 0x00080000);
 }

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/nv50.c
index 7b8756d..33dd89f 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/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);

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c
index fd99380..62dde9b 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c
@@ -27,7 +27,7 @@
 static int
 nvd0_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) & 0x00000010);
 }
@@ -35,7 +35,7 @@ nvd0_i2c_sense_scl(struct nouveau_i2c_port *base)
 static int
 nvd0_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) & 0x00000020);
 }

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/pad.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/pad.c
index e9e4124..a3d0d82 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/pad.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/pad.c
@@ -48,7 +48,7 @@ nvkm_i2c_pad_create_(struct nouveau_object *parent,
                     struct nouveau_oclass *oclass, int index,
                     int size, void **pobject)
 {
-       struct nouveau_i2c *i2c = (void *)engine;
+       struct nouveau_i2c *i2c = nouveau_i2c(parent);
        struct nouveau_i2c_port *port;
        struct nvkm_i2c_pad *pad;
        int ret;

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/pad.h b/drivers/gpu/drm/nouveau/core/subdev/i2c/pad.h
index 89aea46..f03138b 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/pad.h
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/pad.h
@@ -47,7 +47,7 @@ int _nvkm_i2c_pad_fini(struct nouveau_object *, bool);
 #ifndef MSG
 #define MSG(l,f,a...) do {                                                     \
        struct nvkm_i2c_pad *_pad = (void *)pad;                               \
-       nv_##l(nv_object(_pad)->engine, "PAD:%c:%02x: "f,                      \
+       nv_##l(_pad, "PAD:%c:%02x: "f,                                         \
               _pad->index >= 0x100 ? 'X' : 'S',                               \
               _pad->index >= 0x100 ? _pad->index - 0x100 : _pad->index, ##a); \
 } while(0)

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/padgm204.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/padgm204.c
index f0e6fbb..1630a93 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/padgm204.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/padgm204.c
@@ -32,7 +32,7 @@ struct gm204_i2c_pad {
 static int
 gm204_i2c_pad_fini(struct nouveau_object *object, bool suspend)
 {
-       struct nouveau_i2c *i2c = (void *)object->engine;
+       struct nouveau_i2c *i2c = (void *)nouveau_i2c(object);
        struct gm204_i2c_pad *pad = (void *)object;
        nv_mask(i2c, 0x00d97c + pad->addr, 0x00000001, 0x00000001);
        return nvkm_i2c_pad_fini(&pad->base, suspend);
@@ -41,7 +41,7 @@ gm204_i2c_pad_fini(struct nouveau_object *object, bool suspend)
 static int
 gm204_i2c_pad_init(struct nouveau_object *object)
 {
-       struct nouveau_i2c *i2c = (void *)object->engine;
+       struct nouveau_i2c *i2c = (void *)nouveau_i2c(object);
        struct gm204_i2c_pad *pad = (void *)object;
 
        switch (nv_oclass(pad->base.next)->handle) {

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/padnv94.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/padnv94.c
index 0dc6753..afe7989 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/padnv94.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/padnv94.c
@@ -32,7 +32,7 @@ struct nv94_i2c_pad {
 static int
 nv94_i2c_pad_fini(struct nouveau_object *object, bool suspend)
 {
-       struct nouveau_i2c *i2c = (void *)object->engine;
+       struct nouveau_i2c *i2c = (void *)nouveau_i2c(object);
        struct nv94_i2c_pad *pad = (void *)object;
        nv_mask(i2c, 0x00e50c + pad->addr, 0x00000001, 0x00000001);
        return nvkm_i2c_pad_fini(&pad->base, suspend);
@@ -41,7 +41,7 @@ nv94_i2c_pad_fini(struct nouveau_object *object, bool suspend)
 static int
 nv94_i2c_pad_init(struct nouveau_object *object)
 {
-       struct nouveau_i2c *i2c = (void *)object->engine;
+       struct nouveau_i2c *i2c = (void *)nouveau_i2c(object);
        struct nv94_i2c_pad *pad = (void *)object;
 
        switch (nv_oclass(pad->base.next)->handle) {

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/port.h b/drivers/gpu/drm/nouveau/core/subdev/i2c/port.h
index a8ff6e0..b9acf78 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/port.h
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/port.h
@@ -6,7 +6,7 @@
 #ifndef MSG
 #define MSG(l,f,a...) do {                                                     \
        struct nouveau_i2c_port *_port = (void *)port;                         \
-       nv_##l(nv_object(_port)->engine, "PORT:%02x: "f, _port->index, ##a);   \
+       nv_##l(_port, "PORT:%02x: "f, _port->index, ##a);                      \
 } while(0)
 #define DBG(f,a...) MSG(debug, f, ##a)
 #define ERR(f,a...) MSG(error, f, ##a)