diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-09-16 00:00:33 +0200 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2008-10-17 23:10:53 +0200 |
commit | 9bfbd5cb72c9edb8504a4a7a0aa89cdb2fcb4845 (patch) | |
tree | b59f08475d3366e60e3c93538ad398905c4a74ec /drivers/gpu/drm/drm_irq.c | |
parent | drm: wbinvd is cache coherent. (diff) | |
download | linux-9bfbd5cb72c9edb8504a4a7a0aa89cdb2fcb4845.tar.xz linux-9bfbd5cb72c9edb8504a4a7a0aa89cdb2fcb4845.zip |
drm: kill drm_device->irq
Like the last patch but adds a macro to get at the irq value instead of
dereferencing pdev directly. Should make things easier for the BSD guys and
if we ever support non-PCI devices.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_irq.c')
-rw-r--r-- | drivers/gpu/drm/drm_irq.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index d0c13d954f52..4091b9e291f9 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -228,12 +228,9 @@ int drm_irq_install(struct drm_device *dev) if (drm_core_check_feature(dev, DRIVER_IRQ_SHARED)) sh_flags = IRQF_SHARED; - ret = request_irq(dev->pdev->irq, dev->driver->irq_handler, + ret = request_irq(drm_dev_to_irq(dev), dev->driver->irq_handler, sh_flags, dev->devname, dev); - /* Expose the device irq number to drivers that want to export it for - * whatever reason. - */ - dev->irq = dev->pdev->irq; + if (ret < 0) { mutex_lock(&dev->struct_mutex); dev->irq_enabled = 0; |