drm/nouveau/bios: convert to new-style nvkm_subdev

[mirror_ubuntu-eoan-kernel.git] / drivers / gpu / drm / nouveau / nvkm / subdev / clk / mcp77.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
index 31e8fa02ba7496b68b93741671eb0de256c083a1..b2be8a6acfc16e7083317fc14bc188a247a0a257 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
@@ -164,11 +164,11 @@ static u32
 calc_pll(struct mcp77_clk *clk, u32 reg,
         u32 clock, int *N, int *M, int *P)
 {
-       struct nvkm_bios *bios = nvkm_bios(clk);
+       struct nvkm_subdev *subdev = &clk->base.subdev;
        struct nvbios_pll pll;
        int ret;
 
-       ret = nvbios_pll_parse(bios, reg, &pll);
+       ret = nvbios_pll_parse(subdev->device->bios, reg, &pll);
        if (ret)
                return 0;
 
@@ -177,7 +177,7 @@ calc_pll(struct mcp77_clk *clk, u32 reg,
        if (!pll.refclk)
                return 0;
 
-       return nv04_pll_calc(nv_subdev(clk), &pll, clock, N, M, NULL, NULL, P);
+       return nv04_pll_calc(subdev, &pll, clock, N, M, NULL, NULL, P);
 }
 
 static inline u32