[PATCH 33/50] drm: remove drm_dev_to_irq from drivers

[Daniel Vetter]

Only used in some legacy pci drivers, and dereferncing the pci irq is
actually shorter ...

Since this removes all users for drm_dev_to_irq from the tree except
in drm_irq.c, move the inline helper in there. It'll disappear soon,
too.

Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
---
 drivers/gpu/drm/drm_irq.c             | 5 +++++
 drivers/gpu/drm/mga/mga_state.c       | 2 +-
 drivers/gpu/drm/r128/r128_state.c     | 2 +-
 drivers/gpu/drm/radeon/radeon_state.c | 2 +-
 include/drm/drmP.h                    | 5 -----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index d24ac519c6f3..38c0bab3296e 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -233,6 +233,11 @@ static void drm_irq_vgaarb_nokms(void *cookie, bool state)
        }
 }

+static inline int drm_dev_to_irq(struct drm_device *dev)
+{
+       return dev->driver->bus->get_irq(dev);
+}
+
 /**
  * Install IRQ handler.
  *
diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c
index 314685b7f41f..3cb58df5237e 100644
--- a/drivers/gpu/drm/mga/mga_state.c
+++ b/drivers/gpu/drm/mga/mga_state.c
@@ -1020,7 +1020,7 @@ static int mga_getparam(struct drm_device *dev, void 
*data, struct drm_file *fil

        switch (param->param) {
        case MGA_PARAM_IRQ_NR:
-               value = drm_dev_to_irq(dev);
+               value = dev->pdev->irq;
                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 818986b52e8c..22a5545c5f49 100644
--- a/drivers/gpu/drm/r128/r128_state.c
+++ b/drivers/gpu/drm/r128/r128_state.c
@@ -1616,7 +1616,7 @@ static int r128_getparam(struct drm_device *dev, void 
*data, struct drm_file *fi

        switch (param->param) {
        case R128_PARAM_IRQ_NR:
-               value = drm_dev_to_irq(dev);
+               value = dev->pdev->irq;
                break;
        default:
                return -EINVAL;
diff --git a/drivers/gpu/drm/radeon/radeon_state.c 
b/drivers/gpu/drm/radeon/radeon_state.c
index 956ab7f14e16..b576549fc783 100644
--- a/drivers/gpu/drm/radeon/radeon_state.c
+++ b/drivers/gpu/drm/radeon/radeon_state.c
@@ -3054,7 +3054,7 @@ static int radeon_cp_getparam(struct drm_device *dev, 
void *data, struct drm_fil
                if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
                        value = 0;
                else
-                       value = drm_dev_to_irq(dev);
+                       value = dev->pdev->irq;
                break;
        case RADEON_PARAM_GART_BASE:
                value = dev_priv->gart_vm_start;
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 847e314b1740..7eac463efc10 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1205,11 +1205,6 @@ static __inline__ int drm_core_check_feature(struct 
drm_device *dev,
        return ((dev->driver->driver_features & feature) ? 1 : 0);
 }

-static inline int drm_dev_to_irq(struct drm_device *dev)
-{
-       return dev->driver->bus->get_irq(dev);
-}
-
 static inline void drm_device_set_unplugged(struct drm_device *dev)
 {
        smp_wmb();
-- 
1.8.4.3