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:40:26 +1000 |
| commit | 7f5f518fd70b1b72ca4cf8249ca3306846383ed4 (patch) | |
| tree | 70f168419f7b4676e5eb2ee673e74e4660111b5c /drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c | |
| parent | 53003941067534b1071b0f7b71f4700c16d97b28 (diff) | |
| download | lwn-7f5f518fd70b1b72ca4cf8249ca3306846383ed4.tar.gz lwn-7f5f518fd70b1b72ca4cf8249ca3306846383ed4.zip | |
drm/nouveau/bios: remove object accessor functions
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c index a0d7505eeed7..3ddf0939ded3 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c @@ -78,14 +78,14 @@ mxm_sor_map(struct nvkm_bios *bios, u8 conn) u8 ver, hdr; u16 mxm = mxm_table(bios, &ver, &hdr); if (mxm && hdr >= 6) { - u16 map = nv_ro16(bios, mxm + 4); + u16 map = nvbios_rd16(bios, mxm + 4); if (map) { - ver = nv_ro08(bios, map); + ver = nvbios_rd08(bios, map); if (ver == 0x10) { - if (conn < nv_ro08(bios, map + 3)) { - map += nv_ro08(bios, map + 1); + if (conn < nvbios_rd08(bios, map + 3)) { + map += nvbios_rd08(bios, map + 1); map += conn; - return nv_ro08(bios, map); + return nvbios_rd08(bios, map); } return 0x00; @@ -115,14 +115,14 @@ mxm_ddc_map(struct nvkm_bios *bios, u8 port) u8 ver, hdr; u16 mxm = mxm_table(bios, &ver, &hdr); if (mxm && hdr >= 8) { - u16 map = nv_ro16(bios, mxm + 6); + u16 map = nvbios_rd16(bios, mxm + 6); if (map) { - ver = nv_ro08(bios, map); + ver = nvbios_rd08(bios, map); if (ver == 0x10) { - if (port < nv_ro08(bios, map + 3)) { - map += nv_ro08(bios, map + 1); + if (port < nvbios_rd08(bios, map + 3)) { + map += nvbios_rd08(bios, map + 1); map += port; - return nv_ro08(bios, map); + return nvbios_rd08(bios, map); } return 0x00; |