7 files changed, 6 insertions, 14 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;
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 82f4657b8879..141e33004a76 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -107,7 +107,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
 #ifdef __alpha__
         dev->hose = pdev->sysdata;
 #endif
-        dev->irq = pdev->irq;
 
         if (drm_ht_create(&dev->map_hash, 12)) {
                 return -ENOMEM;
diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c
index d3f8aade07b3..b710fab21cb3 100644
--- a/drivers/gpu/drm/mga/mga_state.c
+++ b/drivers/gpu/drm/mga/mga_state.c
@@ -1022,7 +1022,7 @@ static int mga_getparam(struct drm_device *dev, void *data, struct drm_file *fil
 
         switch (param->param) {
         case MGA_PARAM_IRQ_NR:
-                value = dev->irq;
+                value = drm_dev_to_irq(dev);
                 break;
         case MGA_PARAM_CARD_TYPE:
                 value = dev_priv->chipset;
diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
index 51a9afce7b9b..f7a5b5740764 100644
--- a/drivers/gpu/drm/r128/r128_state.c
+++ b/drivers/gpu/drm/r128/r128_state.c
@@ -1629,7 +1629,7 @@ static int r128_getparam(struct drm_device *dev, void *data, struct drm_file *fi
 
         switch (param->param) {
         case R128_PARAM_IRQ_NR:
-                value = dev->irq;
+                value = drm_dev_to_irq(dev);
                 break;
         default:
                 return -EINVAL;
diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
index 11c146b49211..5d7153fcc7b0 100644
--- a/drivers/gpu/drm/radeon/radeon_state.c
+++ b/drivers/gpu/drm/radeon/radeon_state.c
@@ -2997,7 +2997,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
                 value = GET_SCRATCH(2);
                 break;
         case RADEON_PARAM_IRQ_NR:
-                value = dev->irq;
+                value = drm_dev_to_irq(dev);
                 break;
         case RADEON_PARAM_GART_BASE:
                 value = dev_priv->gart_vm_start;
diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
index 1b966fbdb49f..665d319b927b 100644
--- a/drivers/gpu/drm/via/via_irq.c
+++ b/drivers/gpu/drm/via/via_irq.c
@@ -354,9 +354,6 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
         drm_via_irq_t *cur_irq = dev_priv->via_irqs;
         int force_sequence;
 
-        if (!dev->irq)
-                return -EINVAL;
-
         if (irqwait->request.irq >= dev_priv->num_irqs) {
                 DRM_ERROR("Trying to wait on unknown irq %d\n",
                           irqwait->request.irq);
diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c
index e64094916e4f..f694cb5ededc 100644
--- a/drivers/gpu/drm/via/via_mm.c
+++ b/drivers/gpu/drm/via/via_mm.c
@@ -93,8 +93,7 @@ int via_final_context(struct drm_device *dev, int context)
         /* Last context, perform cleanup */
         if (dev->ctx_count == 1 && dev->dev_private) {
                 DRM_DEBUG("Last Context\n");
-                if (dev->irq)
-                        drm_irq_uninstall(dev);
+                drm_irq_uninstall(dev);
                 via_cleanup_futex(dev_priv);
                 via_do_cleanup_map(dev);
         }