diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:13 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:37:34 +1000 |
| commit | 3b9f531b7333271cc2eaeb3b683048b46102185a (patch) | |
| tree | d3e8d296dcb413fb7c49bdc037fcccd4139021ad /drm/nouveau/nvkm/subdev/gpio | |
| parent | c92dfb1ad5716384f201e1ac00f72d30680360ab (diff) | |
| download | nouveau-3b9f531b7333271cc2eaeb3b683048b46102185a.tar.gz | |
bios: remove object accessor functions
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/nvkm/subdev/gpio')
| -rw-r--r-- | drm/nouveau/nvkm/subdev/gpio/gf110.c | 2 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/subdev/gpio/nv50.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drm/nouveau/nvkm/subdev/gpio/gf110.c b/drm/nouveau/nvkm/subdev/gpio/gf110.c index a2c019bb7..a5aae486e 100644 --- a/drm/nouveau/nvkm/subdev/gpio/gf110.c +++ b/drm/nouveau/nvkm/subdev/gpio/gf110.c @@ -33,7 +33,7 @@ gf110_gpio_reset(struct nvkm_gpio *gpio, u8 match) int ent = -1; while ((entry = dcb_gpio_entry(bios, 0, ++ent, &ver, &len))) { - u32 data = nv_ro32(bios, entry); + u32 data = nvbios_rd32(bios, entry); u8 line = (data & 0x0000003f); u8 defs = !!(data & 0x00000080); u8 func = (data & 0x0000ff00) >> 8; diff --git a/drm/nouveau/nvkm/subdev/gpio/nv50.c b/drm/nouveau/nvkm/subdev/gpio/nv50.c index ca2d866a3..468983605 100644 --- a/drm/nouveau/nvkm/subdev/gpio/nv50.c +++ b/drm/nouveau/nvkm/subdev/gpio/nv50.c @@ -34,7 +34,7 @@ nv50_gpio_reset(struct nvkm_gpio *gpio, u8 match) while ((entry = dcb_gpio_entry(bios, 0, ++ent, &ver, &len))) { static const u32 regs[] = { 0xe100, 0xe28c }; - u32 data = nv_ro32(bios, entry); + u32 data = nvbios_rd32(bios, entry); u8 line = (data & 0x0000001f); u8 func = (data & 0x0000ff00) >> 8; u8 defs = !!(data & 0x01000000); |