[PATCH v3 32/37] drm/nouveau: remove nouveau_chan.device

[Ben Skeggs]

nouveau_chan.device is always the same as nouveau_chan.cli.device,
so there's no need to store it separately.

Signed-off-by: Ben Skeggs <bske...@nvidia.com>
---
 drivers/gpu/drm/nouveau/nouveau_chan.c | 6 +++---
 drivers/gpu/drm/nouveau/nouveau_chan.h | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c 
b/drivers/gpu/drm/nouveau/nouveau_chan.c
index e18a80fda2ca..127bd518030d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -157,7 +157,6 @@ nouveau_channel_prep(struct nouveau_cli *cli,
                return -ENOMEM;
 
        chan->cli = cli;
-       chan->device = device;
        chan->drm = drm;
        chan->vmm = nouveau_cli_vmm(cli);
        atomic_set(&chan->killed, 0);
@@ -364,8 +363,9 @@ nouveau_channel_ctor(struct nouveau_cli *cli, bool priv, 
u64 runm,
 static int
 nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
 {
-       struct nvif_device *device = chan->device;
-       struct nouveau_drm *drm = chan->drm;
+       struct nouveau_cli *cli = chan->cli;
+       struct nouveau_drm *drm = cli->drm;
+       struct nvif_device *device = &cli->device;
        struct nv_dma_v0 args = {};
        int ret, i;
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.h 
b/drivers/gpu/drm/nouveau/nouveau_chan.h
index 260febd634ee..18a9cbfef8ca 100644
--- a/drivers/gpu/drm/nouveau/nouveau_chan.h
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.h
@@ -13,7 +13,6 @@ struct nouveau_channel {
        } chan;
 
        struct nouveau_cli *cli;
-       struct nvif_device *device;
        struct nouveau_drm *drm;
        struct nouveau_vmm *vmm;
 
-- 
2.45.1