diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2016-05-30 08:17:58 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-07-14 11:53:25 +1000 |
| commit | d398119034a4b78d475e3853b3b0ad9fa26f6c52 (patch) | |
| tree | d5324bb80e1dbaff5f1e978f24b1fd8b04e42225 /drivers/gpu/drm/nouveau/nvkm/subdev/pci | |
| parent | drm/nouveau/mc: allow construction of subclassed device (diff) | |
| download | linux-dev-d398119034a4b78d475e3853b3b0ad9fa26f6c52.tar.xz linux-dev-d398119034a4b78d475e3853b3b0ad9fa26f6c52.zip | |
drm/nouveau/mc: take nvkm_device as argument to public functions
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/pci')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c index 6b0328bd7eed..eb9b278198b2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c @@ -69,15 +69,13 @@ static irqreturn_t nvkm_pci_intr(int irq, void *arg) { struct nvkm_pci *pci = arg; - struct nvkm_mc *mc = pci->subdev.device->mc; + struct nvkm_device *device = pci->subdev.device; bool handled = false; - if (likely(mc)) { - nvkm_mc_intr_unarm(mc); - if (pci->msi) - pci->func->msi_rearm(pci); - nvkm_mc_intr(mc, &handled); - nvkm_mc_intr_rearm(mc); - } + nvkm_mc_intr_unarm(device); + if (pci->msi) + pci->func->msi_rearm(pci); + nvkm_mc_intr(device, &handled); + nvkm_mc_intr_rearm(device); return handled ? IRQ_HANDLED : IRQ_NONE; } |