diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:06 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:37:26 +1000 |
commit | 1f8f87e9a77a3815f6e902801f1940ed00860a07 (patch) | |
tree | cf9957d1d6b7d84397b6bbbfc6b87d1ec13984b6 /drm/nouveau/nvkm/subdev/bus/nv31.c | |
parent | d9202d5b4830de1d4b2f88f49a8b131c0dc0edbf (diff) | |
download | nouveau-1f8f87e9a77a3815f6e902801f1940ed00860a07.tar.gz |
bus: cosmetic changes
This is purely preparation for upcoming commits, there should be no
code changes here.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/nvkm/subdev/bus/nv31.c')
-rw-r--r-- | drm/nouveau/nvkm/subdev/bus/nv31.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drm/nouveau/nvkm/subdev/bus/nv31.c b/drm/nouveau/nvkm/subdev/bus/nv31.c index c5739bce8..7565d2f04 100644 --- a/drm/nouveau/nvkm/subdev/bus/nv31.c +++ b/drm/nouveau/nvkm/subdev/bus/nv31.c @@ -27,54 +27,54 @@ static void nv31_bus_intr(struct nvkm_subdev *subdev) { - struct nvkm_bus *pbus = nvkm_bus(subdev); - u32 stat = nv_rd32(pbus, 0x001100) & nv_rd32(pbus, 0x001140); - u32 gpio = nv_rd32(pbus, 0x001104) & nv_rd32(pbus, 0x001144); + struct nvkm_bus *bus = nvkm_bus(subdev); + u32 stat = nv_rd32(bus, 0x001100) & nv_rd32(bus, 0x001140); + u32 gpio = nv_rd32(bus, 0x001104) & nv_rd32(bus, 0x001144); if (gpio) { - subdev = nvkm_subdev(pbus, NVDEV_SUBDEV_GPIO); + subdev = nvkm_subdev(bus, NVDEV_SUBDEV_GPIO); if (subdev && subdev->intr) subdev->intr(subdev); } if (stat & 0x00000008) { /* NV41- */ - u32 addr = nv_rd32(pbus, 0x009084); - u32 data = nv_rd32(pbus, 0x009088); + u32 addr = nv_rd32(bus, 0x009084); + u32 data = nv_rd32(bus, 0x009088); - nv_error(pbus, "MMIO %s of 0x%08x FAULT at 0x%06x\n", + nv_error(bus, "MMIO %s of 0x%08x FAULT at 0x%06x\n", (addr & 0x00000002) ? "write" : "read", data, (addr & 0x00fffffc)); stat &= ~0x00000008; - nv_wr32(pbus, 0x001100, 0x00000008); + nv_wr32(bus, 0x001100, 0x00000008); } if (stat & 0x00070000) { - subdev = nvkm_subdev(pbus, NVDEV_SUBDEV_THERM); + subdev = nvkm_subdev(bus, NVDEV_SUBDEV_THERM); if (subdev && subdev->intr) subdev->intr(subdev); stat &= ~0x00070000; - nv_wr32(pbus, 0x001100, 0x00070000); + nv_wr32(bus, 0x001100, 0x00070000); } if (stat) { - nv_error(pbus, "unknown intr 0x%08x\n", stat); - nv_mask(pbus, 0x001140, stat, 0x00000000); + nv_error(bus, "unknown intr 0x%08x\n", stat); + nv_mask(bus, 0x001140, stat, 0x00000000); } } static int nv31_bus_init(struct nvkm_object *object) { - struct nv04_bus_priv *priv = (void *)object; + struct nvkm_bus *bus = (void *)object; int ret; - ret = nvkm_bus_init(&priv->base); + ret = nvkm_bus_init(bus); if (ret) return ret; - nv_wr32(priv, 0x001100, 0xffffffff); - nv_wr32(priv, 0x001140, 0x00070008); + nv_wr32(bus, 0x001100, 0xffffffff); + nv_wr32(bus, 0x001140, 0x00070008); return 0; } |