diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:09 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:15 +1000 |
commit | 6f2274991043a3db2ab84b5d9462a085d38f1fb1 (patch) | |
tree | a63bbb4ebd844d8d80fecac7ce90926dbe46b35d /drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c | |
parent | 4de93a086eb0315f0bd8e1d6da40186842670b57 (diff) | |
download | op-kernel-dev-6f2274991043a3db2ab84b5d9462a085d38f1fb1.zip op-kernel-dev-6f2274991043a3db2ab84b5d9462a085d38f1fb1.tar.gz |
drm/nouveau/i2c: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c index bf86502..6795e5c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c @@ -27,16 +27,18 @@ static int gf110_i2c_sense_scl(struct nvkm_i2c_port *base) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); + struct nvkm_device *device = i2c->subdev.device; struct nv50_i2c_port *port = (void *)base; - return !!(nv_rd32(i2c, port->addr) & 0x00000010); + return !!(nvkm_rd32(device, port->addr) & 0x00000010); } static int gf110_i2c_sense_sda(struct nvkm_i2c_port *base) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); + struct nvkm_device *device = i2c->subdev.device; struct nv50_i2c_port *port = (void *)base; - return !!(nv_rd32(i2c, port->addr) & 0x00000020); + return !!(nvkm_rd32(device, port->addr) & 0x00000020); } static const struct nvkm_i2c_func |